aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'Michael Niedermayer2013-12-064-112/+153
|\
| * ljpegenc: deMpegEncContextizeAnton Khirnov2013-12-053-82/+134
* | avcodec/ljpegenc: Dont use ff_mjpeg_encode_stuffing()Michael Niedermayer2013-12-061-1/+1
* | avcodec/mjpegenc: move end padding/alignment to ff_mjpeg_escape_FF()Michael Niedermayer2013-12-061-5/+9
* | avcodec/mjpegenc: make escape_FF() non staticMichael Niedermayer2013-12-062-2/+3
* | avcodec/ljpegenc: fix mem allocation failure return code encode_picture_lossl...Michael Niedermayer2013-12-061-1/+1
* | Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'Michael Niedermayer2013-12-063-15/+15
|\|
| * mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()Anton Khirnov2013-12-053-15/+15
* | Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'Michael Niedermayer2013-12-064-14/+13
|\|
| * mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()Anton Khirnov2013-12-054-14/+14
* | Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'Michael Niedermayer2013-12-064-53/+86
|\|
| * mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()Anton Khirnov2013-12-054-47/+74
* | Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'Michael Niedermayer2013-12-061-8/+10
|\|
| * mjpegenc: do not pass MpegEncContext to jpeg_table_header()Anton Khirnov2013-12-051-5/+5
| * mjpegenc: remove commented out never-to-be-finished WIP cruftAnton Khirnov2013-12-051-25/+0
* | Merge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'Michael Niedermayer2013-12-061-6/+5
|\|
| * mjpegenc: do not pass MpegEncContext to put_huffman_table()Anton Khirnov2013-12-051-6/+5
* | Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'Michael Niedermayer2013-12-061-15/+14
|\|
| * mjpegenc: cosmetics, reformat jpeg_put_comments()Anton Khirnov2013-12-051-15/+14
* | Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'Michael Niedermayer2013-12-061-10/+9
|\|
| * mjpegenc: write the JFIF header if the sample aspect ratio is setAnton Khirnov2013-12-051-10/+9
* | Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'Michael Niedermayer2013-12-063-25/+0
|\|
| * mpegvideo: do not set current_picture_ptr in decodersAnton Khirnov2013-12-053-25/+0
* | Merge commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90'Michael Niedermayer2013-12-061-12/+12
|\|
| * vc1dec: move setting repeat_pict after frame_start() has been called.Anton Khirnov2013-12-051-12/+12
* | Merge commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848'Michael Niedermayer2013-12-062-6/+3
|\|
| * mpegvideo: make ff_release_unused_pictures() staticAnton Khirnov2013-12-052-6/+3
* | Merge commit 'c99307caee01441cfde24f3b7b0db3037b7022dc'Michael Niedermayer2013-12-063-9/+12
|\|
| * mpegvideo: make frame_size_alloc() static.Anton Khirnov2013-12-052-5/+4
* | Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4'Michael Niedermayer2013-12-063-27/+29
|\|
| * mpegvideo: move encode-only parts of common_end() to encode_end()Anton Khirnov2013-12-053-22/+24
* | Merge commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d'Michael Niedermayer2013-12-061-18/+0
|\|
| * mpegvideo: remove commented out cruft from ff_MPV_frame_end()Anton Khirnov2013-12-051-18/+0
* | avcodec/mpegvideo_enc: fix linesizes in frame_end()Michael Niedermayer2013-12-061-3/+3
* | Merge commit '381a722562bcc0b623acf6a00a583fe989bcb72a'Michael Niedermayer2013-12-062-10/+38
|\|
| * mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separat...Anton Khirnov2013-12-052-19/+46
* | Merge commit 'b7254288d222013e20539c530b1ec5d324ed5352'Michael Niedermayer2013-12-061-4/+0
|\|
| * mpegvideo: do not update last_non_b_pict_type in update_thread_context()Anton Khirnov2013-12-051-4/+0
* | Merge commit '1f8eb69079880ef1f394c498dfdf471f91222a06'Michael Niedermayer2013-12-062-24/+28
|\|
| * mpegvideo: move encoding-only initialization from common_init() to encode_init()Anton Khirnov2013-12-052-31/+26
* | Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'Michael Niedermayer2013-12-062-3/+3
|\|
| * mpegvideo: move setting encoding-only vars from common_defaults() to encode_d...Anton Khirnov2013-12-052-3/+3
* | Merge commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a'Michael Niedermayer2013-12-061-1/+0
|\|
| * mpegvideo: don't copy input_picture_number in update_thread_context()Anton Khirnov2013-12-051-1/+0
* | Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'Michael Niedermayer2013-12-064-4/+5
|\|
| * mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-053-3/+4
* | Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'Michael Niedermayer2013-12-064-7/+8
|\|
| * mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-054-7/+8
* | Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'Michael Niedermayer2013-12-062-5/+5
|\|
| * mpeg12dec: move first_slice from MpegEncContext to Mpeg1ContextAnton Khirnov2013-12-052-4/+4