Age | Commit message (Collapse) | Author |
|
Fixes ticket #1190.
Reviewed-by: Paul B Mahol
|
|
See ticket #1228.
|
|
* qatar/master:
rtpdec_asf: Set the no_resync_search option for the chained asf demuxer
asfdec: Add an option for not searching for the packet markers
cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
cosmetics: Align codec declarations
cosmetics: Convert mimic.c to utf-8
avconv: remove an unused function parameter.
avconv: remove now pointless variables.
avconv: drop support for building without libavfilter.
nellymoserenc: fix crash due to memsetting the wrong area.
libavformat: Only require first packet to be known for audio/video streams
avplay: Don't try to scale timestamps if the tb isn't set
Conflicts:
Changelog
configure
ffmpeg.c
libavcodec/aacenc.c
libavcodec/bmpenc.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/ffv1.c
libavcodec/flacenc.c
libavcodec/fraps.c
libavcodec/huffyuv.c
libavcodec/libopenjpegdec.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/pamenc.c
libavcodec/pgssubdec.c
libavcodec/pngenc.c
libavcodec/qtrleenc.c
libavcodec/rawdec.c
libavcodec/sgienc.c
libavcodec/tiffenc.c
libavcodec/v210dec.c
libavcodec/wmv2dec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Also break some long lines, remove codec function placeholder comments
and add spaces in sample/pixel format lists.
Signed-off-by: Martin Storsjö <martin@martin.st>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* qatar/master: (36 commits)
adpcmenc: Use correct frame_size for Yamaha ADPCM.
avcodec: add ff_samples_to_time_base() convenience function to internal.h
adx parser: set duration
mlp parser: set duration instead of frame_size
gsm parser: set duration
mpegaudio parser: set duration instead of frame_size
(e)ac3 parser: set duration instead of frame_size
flac parser: set duration instead of frame_size
avcodec: add duration field to AVCodecParserContext
avutil: add av_rescale_q_rnd() to allow different rounding
pnmdec: remove useless .pix_fmts
libmp3lame: support float and s32 sample formats
libmp3lame: renaming, rearrangement, alignment, and comments
libmp3lame: use the LAME default bit rate
libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing
libmp3lame: cosmetics: remove some pointless comments
libmp3lame: convert some debugging code to av_dlog()
libmp3lame: remove outdated comment.
libmp3lame: do not set coded_frame->key_frame.
libmp3lame: improve error handling in MP3lame_encode_init()
...
Conflicts:
doc/APIchanges
libavcodec/libmp3lame.c
libavcodec/pcxenc.c
libavcodec/pnmdec.c
libavcodec/pnmenc.c
libavcodec/sgienc.c
libavcodec/utils.c
libavformat/hls.c
libavutil/avutil.h
libswscale/x86/swscale_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
Set the pict_type/key_frame properties on the coded picture.
|
|
* qatar/master: (21 commits)
build: simplify commands for clean target
swscale: split swscale.c in unscaled and generic conversion routines.
swscale: cosmetics.
swscale: integrate (literally) swscale_template.c in swscale.c.
swscale: split out x86/swscale_template.c from swscale.c.
swscale: enable hScale_altivec_real.
swscale: split out ppc _template.c files from main swscale.c.
swscale: remove indirections in ppc/swscale_template.c.
swscale: split out unscaled altivec YUV converters in their own file.
mpegvideoenc: fix multislice fate tests with threading disabled.
mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro.
build: Simplify texi2html invocation through the --output option.
Mark some variables with av_unused
Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name().
svq3: Check negative mb_type to fix potential crash.
svq3: Move svq3-specific fields to their own context.
rawdec: initialize return value to 0.
Remove unused get_psnr() prototype
rawdec: don't leak option strings.
bktr: get default framerate from video standard.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This fixes warnings about avcodec_get_pix_fmt_name() being deprecated.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
|
|
|
|
Signed-off-by: Diego Biurrun <diego@biurrun.de>
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
|
|
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Patch sponsored by Animoto.
Originally committed as revision 25470 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 25465 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
and decoder.
Originally committed as revision 25464 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 25455 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
not supported.
Originally committed as revision 25454 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Patch by Alexis Ballier gmail_address(name, surname)
Originally committed as revision 22320 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 20121 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Patch by Anne-Laure de Smit: gmail_address(annelaure, desmit)
Originally committed as revision 20120 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Makes no difference for gcc but at least icc can put them in .rodata then.
Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 13492 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Fixes icc warning #188: enumerated type mixed with another type
Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 13059 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13022 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Not only the repeated byte is calculated as (count ^ xor) + add
but also the raw encoding lenth byte is calculated as that too
patch by Xiaohui Sun sunxiaohui dsp ac cn
Originally committed as revision 8602 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8598 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8434 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Bobby Bingham, uhmmmm gmail com
Originally committed as revision 8430 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8429 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Bobby Bingham % uhmmmm A gmail P com %
Only handles 24-bit BGR and 8-bit grayscale, no RLE at the moment either.
Original thread:
Date: Mar 11, 2007 7:58 PM
Subject: [Ffmpeg-devel] [PATCH] Targa encoder
Originally committed as revision 8411 to svn://svn.ffmpeg.org/ffmpeg/trunk
|