Age | Commit message (Collapse) | Author |
|
* qatar/master:
cosmetics: Consistently use C-style comments with multiple inclusion guards
anm: fix a few Doxygen comments
misc typo and wording fixes
attributes: add av_noreturn
attributes: drop pointless define guards
configure: do not disable av_always_inline with --enable-small
flvdec: initial stream switch support
avplay: fix write on freed memory for rawvideo
snow: remove a VLA used for edge emulation
x86: lavfi: fix gradfun/yadif build with mmx/sse disabled
snow: remove the runs[] VLA.
snow: Check mallocs at init
flacdec: remove redundant setting of avctx->sample_fmt
Conflicts:
ffplay.c
libavcodec/h264.c
libavcodec/snow.c
libavcodec/snow.h
libavcodec/snowdec.c
libavcodec/snowenc.c
libavformat/flvdec.c
libavutil/attributes.h
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* qatar/master: (22 commits)
rv40dsp x86: use only one register, for both increment and loop counter
rv40dsp: implement prescaled versions for biweight.
avconv: use default channel layouts when they are unknown
avconv: parse channel layout string
nutdec: K&R formatting cosmetics
vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
mem: Consistently return NULL for av_malloc(0)
vf_overlay: implement poll_frame()
vf_scale: support named constants for sws flags.
lavc doxy: add all installed headers to doxy groups.
lavc doxy: add avfft to the main lavc group.
lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
lavc doxy: add AVPicture functions to a doxy group.
lavc doxy: add resampling functions to a doxy group.
lavc doxy: replace \ with /
lavc doxy: add encoding functions to a doxy group.
lavc doxy: add decoding functions to a doxy group.
lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
lavc doxy: add AVPacket-related stuff to a separate doxy group.
lavc doxy: add core functions/definitions to a doxy group.
...
Conflicts:
ffmpeg.c
libavcodec/avcodec.h
libavcodec/vda.c
libavcodec/x86/rv40dsp.asm
libavfilter/vf_scale.c
libavformat/nutdec.c
libavutil/mem.c
tests/ref/acodec/pcm_s24daud
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* qatar/master: (37 commits)
In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
lavc: remove reference to opt.h from Makefile.
prefer avio_check() over url_exist()
avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
lavu: remove misc disabled cruft
lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft
lavc: remove misc disabled cruft.
lavc: remove the FF_API_INOFFICIAL cruft.
lavc: remove the FF_API_SET_STRING_OLD cruft.
lavc: remove the FF_API_USE_LPC cruft.
lavc: remove the FF_API_SUBTITLE_OLD cruft.
lavc: remove the FF_API_VIDEO_OLD cruft.
lavc: remove the FF_API_AUDIO_OLD cruft.
lavc: remove the FF_API_OPT_SHOW cruft.
lavc: remove the FF_API_MM_FLAGS cruft.
lavf: remove misc disabled cruft.
lavf: remove FF_API_INDEX_BUILT cruft
lavf: remove FF_API_URL_CLASS cruft.
lavf: remove FF_API_SYMVER cruft
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17960 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17400 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17384 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17383 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17361 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
total_number_of_mv_blocks --> allocated_mv_blocks
total_number_of_data_blocks --> allocated_data_blocks
Originally committed as revision 17356 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17355 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17354 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17353 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17352 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17350 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17349 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
change in the name of the struct member xvmc_id.
Originally committed as revision 17348 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17345 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17343 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17342 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17341 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17339 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17338 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17314 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17313 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17310 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
and mark state defines as obsolete.
Originally committed as revision 17307 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17306 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
It has always been a workaround for MPlayer limitations.
Originally committed as revision 17305 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
They are not used within FFmpeg.
Originally committed as revision 17302 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Their only user, MPlayer, has already been updated not to use them anymore.
Originally committed as revision 17300 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17299 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17298 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17297 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17269 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
The header was non-public before and the only user, MPlayer, was updated.
Originally committed as revision 17263 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17253 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17252 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17251 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
declarations of XvMCMacroBlock and XvMCSurface.
Originally committed as revision 17250 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17249 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17248 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17247 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17246 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
preserve MP_ ones until next major bump.
Originally committed as revision 17245 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17244 to svn://svn.ffmpeg.org/ffmpeg/trunk
|