- 06 Dec, 2013 22 commits
-
-
Michael Niedermayer authored
* commit 'e1eaaec7': mjpegenc: remove commented out never-to-be-finished WIP cruft Conflicts: libavcodec/mjpegenc.c The unfinished 2-matrix code is left in place and not removed Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'ff506c75': mjpegenc: do not pass MpegEncContext to put_huffman_table() Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'a1ba1f20': mjpegenc: cosmetics, reformat jpeg_put_comments() Conflicts: libavcodec/mjpegenc.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '0812f5a4': mjpegenc: write the JFIF header if the sample aspect ratio is set Conflicts: libavcodec/mjpegenc.c See: f3ce748dMerged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '66499f34': mpegvideo: do not set current_picture_ptr in decoders Conflicts: libavcodec/mss2.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '58a86896': FATE: drop the last partial frame in the wmv8-drm test Conflicts: tests/ref/fate/wmv8-drm Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'ac1fc92e': vc1dec: move setting repeat_pict after frame_start() has been called. Conflicts: libavcodec/vc1dec.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '282c6a1a': mpegvideo: make ff_release_unused_pictures() static Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'c99307ca': mpegvideo: make frame_size_alloc() static. Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '0b0a7a75': mpegvideo: move encode-only parts of common_end() to encode_end() Conflicts: libavcodec/mpegvideo.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'd0d111d0': mpegvideo: remove commented out cruft from ff_MPV_frame_end() Conflicts: libavcodec/mpegvideo.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '381a7225': mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function Conflicts: libavcodec/mpegvideo.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'b7254288': mpegvideo: do not update last_non_b_pict_type in update_thread_context() Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '1f8eb690': mpegvideo: move encoding-only initialization from common_init() to encode_init() Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'bedf952b': mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults() Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '2cab011f': mpegvideo: don't copy input_picture_number in update_thread_context() Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'ff7ffe48': mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'f7d22867': mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'a097f004': mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context Conflicts: libavcodec/mpeg12dec.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'ff300e43': mpegvideo: remove an unused variable Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'e41ff421': mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
- 05 Dec, 2013 18 commits
-
-
James Almer authored
Originally written by James Almer <jamrial@gmail.com> With the following contributions by Timothy Gu <timothygu99@gmail.com> * Use descriptions of libraries from the pkg-config file generation function * Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser) * Use "FFmpeg" for ProductName as MSDN says "name of the product with which the file is distributed" [1]. * Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1]. * Only build the .rc files when --enable-small is not enabled. [1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspxSigned-off-by:
James Almer <jamrial@gmail.com> Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Carl Eugen Hoyos authored
Fixes ticket #3195.
-
Michael Niedermayer authored
This reduces the amount of frames that need to be demuxed in av_find_stream_info() Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
This reduces the number of operations done per non zero coefficient Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Anton Khirnov authored
-
Anton Khirnov authored
It only needs PutBitContext from it, so pass that directly.
-
Anton Khirnov authored
-
Anton Khirnov authored
MpegEncContext.aspect_ratio_info is never set for mjpeg, so this was never written before.
-
Anton Khirnov authored
This code was originally added in 5f194811 to h263 to set decoded frame pts to some random numbers (removed in a1c5cc42) and then cargo culted to other decoders. The code is left in h263dec for now, since some part of the decoder (apparently OBMC) relies on the specific previous frame to be reused.
-
Anton Khirnov authored
This has already been done in eb066a4c, but the number of frames produced from that file changed due to timestamps changes since then.
-
Anton Khirnov authored
This will allow removing the hacks where each decoder sets current_picture_ptr on its own.
-
Anton Khirnov authored
It is only called from one place in mpegvideo.c now. Also remove the remove_current parameter, which is always 1.
-
Anton Khirnov authored
It is not called from outside of mpegvideo.c anymore.
-
Anton Khirnov authored
-
Anton Khirnov authored
-
Anton Khirnov authored
-