]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 3 Jun 2014 16:03:15 +0000 (18:03 +0200)]
Merge commit '
6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617 '
* commit '
6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617 ':
aarch64: remove optional :pg_hi21: for adrp instruction
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jun 2014 15:30:24 +0000 (17:30 +0200)]
Merge commit '
fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e '
* commit '
fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e ':
aarch64: add darwin style PAGE/PAGEOFF relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jun 2014 15:09:17 +0000 (17:09 +0200)]
avcodec/vp3: free tables before allocating new ones
Fixes memleak on seeking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jun 2014 15:08:32 +0000 (17:08 +0200)]
avcodec/vp3: factorize out free_tables()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jun 2014 14:05:37 +0000 (16:05 +0200)]
ffmpeg: use av_log_ask_for_sample() instead of duplicating avpriv_request_sample()
Michael Niedermayer [Tue, 3 Jun 2014 14:03:44 +0000 (16:03 +0200)]
Loose mplayer in MPlayer/incoming/
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jun 2014 13:35:09 +0000 (15:35 +0200)]
Add direct link to ML in missing_feature_sample()
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jun 2014 13:09:42 +0000 (15:09 +0200)]
ffmpeg: request sample if the decoder & demuxer has_b_frames mismatch
We cannot use avpriv_request_sample() as this is private to the libs
or rather it would be a bad usage example
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jun 2014 12:24:37 +0000 (14:24 +0200)]
ffmpeg: remove "has_b_frames" backpassing
It seems working without this now for the files i tested it with, if this causes
a regression, dont hesitate to put the line back or open a ticket or fix (if possible)
the parser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jun 2014 12:44:46 +0000 (14:44 +0200)]
avformat/asfdec: Use a parser for mpeg4-asp to find has_b_frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Tue, 3 Jun 2014 09:24:15 +0000 (11:24 +0200)]
aarch64: remove optional :pg_hi21: for adrp instruction
Clang's integrated assembler does not support it.
Janne Grunau [Sun, 1 Jun 2014 13:50:42 +0000 (15:50 +0200)]
aarch64: add darwin style PAGE/PAGEOFF relocations
Carl Eugen Hoyos [Tue, 3 Jun 2014 08:28:38 +0000 (10:28 +0200)]
Fix fate-opus and fate-aac-ln-encode with --target-path.
Michael Niedermayer [Tue, 3 Jun 2014 02:50:07 +0000 (04:50 +0200)]
avcodec/utils/ff_init_buffer_info: Favor color information from AVFrame if available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 2 Jun 2014 22:54:46 +0000 (00:54 +0200)]
Do not limit blocksize when reading PCM from aiff.
Fixes ticket #3695.
Lou Logan [Mon, 2 Jun 2014 23:17:24 +0000 (15:17 -0800)]
doc/bsf: document noise bitstream filter
Partially addresses ticket #3198.
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Michael Niedermayer [Mon, 2 Jun 2014 19:21:11 +0000 (21:21 +0200)]
avformat/utils/avformat_find_stream_info: Move max_analyze_duration setup out of the packet loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jun 2014 18:18:44 +0000 (20:18 +0200)]
bfin: add README
Based on sh4/README
Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jun 2014 17:38:01 +0000 (19:38 +0200)]
Merge commit '
880e2aa23645ed9871c66ee1cbd00f93c72d2d73 '
* commit '
880e2aa23645ed9871c66ee1cbd00f93c72d2d73 ':
Remove all Blackfin architecture optimizations
Conflicts:
libavcodec/bfin/dsputil.S
libavcodec/bfin/dsputil_init.c
libavcodec/bfin/fdct_bfin.S
libavcodec/bfin/hpel_pixels_no_rnd.S
libavcodec/bfin/hpeldsp_init.c
libavcodec/bfin/idct_bfin.S
libavcodec/bfin/mathops.h
libavcodec/bfin/pixels.S
libavcodec/bfin/pixels.h
libavcodec/bfin/vp3dsp.S
libavcodec/bfin/vp3dsp_init.c
libavutil/bfin/asm.h
libavutil/bfin/attributes.h
libswscale/bfin/internal_bfin.S
libswscale/bfin/swscale_bfin.c
libswscale/bfin/yuv2rgb_bfin.c
libswscale/swscale_internal.h
libswscale/version.h
If someone wants to maintain blackfin support in FFmpeg, please contact
ffmpeg-devel@ffmpeg.org
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jun 2014 17:28:54 +0000 (19:28 +0200)]
Merge commit '
b88cc5cca111132b42c2ee99662bfefe7652e3da '
* commit '
b88cc5cca111132b42c2ee99662bfefe7652e3da ':
bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext
Conflicts:
libavcodec/bink.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jun 2014 17:03:55 +0000 (19:03 +0200)]
avutil/mathematics/av_add_stable: Avoid av_cmp_q() call
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jun 2014 17:00:18 +0000 (19:00 +0200)]
av_add_stable: Add fast special case where step can be represented exactly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jun 2014 16:02:08 +0000 (18:02 +0200)]
avutil/mathematics/av_add_stable: check for the common case of inc=1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jun 2014 16:00:34 +0000 (18:00 +0200)]
avutil/mathematics/av_add_stable: avoid unneeded variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 30 May 2014 10:44:12 +0000 (03:44 -0700)]
Remove all Blackfin architecture optimizations
Blackfin is a painful platform to work with, no test machines are available
and the range of multimedia applications is dubious. Thus it only represents
a maintenance burden.
Michael Niedermayer [Mon, 2 Jun 2014 15:09:53 +0000 (17:09 +0200)]
avformat/utils: Call ff_rfps_add_frame() only for video
This avoids some unneeded computations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 27 May 2014 12:39:12 +0000 (08:39 -0400)]
swr: move compensation_distance handling to swri_resample caller.
I think there's an off-by-one in terms of the switchpoint where we
switch from dst_incr to ideal_dst_incr, I don't think that's a massive
issue, but just be aware of that. It's probably trivial to prevent but
I don't care.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
I could not reproduce any off by 1 error, results are bit exact (michael)
Michael Niedermayer [Mon, 2 Jun 2014 12:48:22 +0000 (14:48 +0200)]
avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jun 2014 12:32:50 +0000 (14:32 +0200)]
avformat/mux: fix memleak of side data in flac fate tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jun 2014 11:11:42 +0000 (13:11 +0200)]
fate: fate-hevc-conformance-INITQP_B_Sony_1 belongs to the 10bit kind
Fixes the test on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 13 Feb 2014 15:32:41 +0000 (16:32 +0100)]
bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext
Carl Eugen Hoyos [Sun, 1 Jun 2014 17:40:56 +0000 (19:40 +0200)]
Report "unknown codec" instead of "unspecifed size" if the codec is unknown.
Timothy Gu [Sun, 1 Jun 2014 04:02:38 +0000 (21:02 -0700)]
tests: Replace fieldmatch test with pixfmt
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 03:53:35 +0000 (05:53 +0200)]
fate: add simple test for async
This only checks that things havnt changed, the values provide little
help in determining if a change is good or bad.
Improvements welcome!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 22:57:08 +0000 (00:57 +0200)]
swr/resample_template: prevent end_index from overflowing and add check for delta_frac overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 27 May 2014 00:38:18 +0000 (20:38 -0400)]
Rewrite main resampling loop (common and linear).
This removes a branch at a performance-sensitive point (in the middle
of the loop). In fate-swr-resample-s32p-8000-2626, this makes the code
about 10% faster. It also simplifies the loops, allowing us to rewrite
it in yasm at some later point.
The compensation_distance != 0 code and index < 0 code are still kind
of hairy. For compensation_distance != 0, this should likely be handled
in the caller, so that it calls swri_resample twice (once until the
dst_incr switch-point, and once with the remainder of the samples). For
index < 0, the code should probably be rewritten to break out of the
loop once sample_index >= 0, and then resume (e.g. as a tail-call) to
the common or linear resampling loops.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 22:32:06 +0000 (00:32 +0200)]
Merge commit '
59cb5747ec3c5cd842b94e574c37889521c97cc4 '
* commit '
59cb5747ec3c5cd842b94e574c37889521c97cc4 ':
rtmpproto: read metadata to set correct FLV header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 21:56:17 +0000 (23:56 +0200)]
Merge commit '
3b18857ab301d2a0b3e86e9d85eed76f0798a29c '
* commit '
3b18857ab301d2a0b3e86e9d85eed76f0798a29c ':
rtmppkt: Add method to read an AMF string that is not prefixed by its type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 21:50:12 +0000 (23:50 +0200)]
Merge commit '
a1859032e39d96352687186fd179e1559dea2aca '
* commit '
a1859032e39d96352687186fd179e1559dea2aca ':
flvdec: Do not default to a video and audio stream
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sun, 1 Jun 2014 14:12:58 +0000 (14:12 +0000)]
x86: hevc_mc: remove unneeded shift
The immediate value may be 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sun, 1 Jun 2014 14:12:57 +0000 (14:12 +0000)]
x86: hevcdsp_init: fix macro usage
The macro was not using the parameter but unconditionally using sse4.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Uwe L. Korn [Sat, 31 May 2014 19:37:26 +0000 (20:37 +0100)]
rtmpproto: read metadata to set correct FLV header
In the presence of no metadata, do not set any stream flag in the FLV
header but let the demuxer handle the detection and creation of streams
as data arrives.
Signed-off-by: Martin Storsjö <martin@martin.st>
Uwe L. Korn [Sat, 31 May 2014 19:37:25 +0000 (20:37 +0100)]
rtmppkt: Add method to read an AMF string that is not prefixed by its type
Signed-off-by: Martin Storsjö <martin@martin.st>
Uwe L. Korn [Sat, 31 May 2014 16:53:01 +0000 (17:53 +0100)]
flvdec: Do not default to a video and audio stream
If no streams were indicated in the FLV header, do not automatically
allocate by default a video and an audio stream. Instead, in the case
that the header did not indicate the presence of any data, allocate no
stream until data actually arrives for one type.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 30 May 2014 19:04:52 +0000 (21:04 +0200)]
avcodec/options: use av_opt_copy() in avcodec_copy_context() to copy priv_data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 19:04:14 +0000 (21:04 +0200)]
avutil/opt: add av_opt_copy()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 19:02:07 +0000 (21:02 +0200)]
avutil/opt: add opt_size()
If people want, this could be exported as av_opt_size()
Michael Niedermayer [Sun, 1 Jun 2014 18:11:30 +0000 (20:11 +0200)]
avcodec/dpx_parser: fix off by 1 error
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 17:53:04 +0000 (19:53 +0200)]
avcodec/mjpegenc: allow encoding amv with height % 16 != 0 when strict -1 is set
This should make it simpler for users to test if such videos work
Suggested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 28 Apr 2012 21:37:08 +0000 (23:37 +0200)]
Fix nonsense non-mod16 AMV flipping code.
It is obviously nonsense since it produces wrong results
or even crashes (crashes should be encode-only though).
Fixes trac issue #1092.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 1 Jun 2014 04:02:39 +0000 (21:02 -0700)]
tests: remove stale fate-update.sh script
This is the same as
5a15602a4e99c730036c33b467f60248889219e1 , which
accidentally did not get merged.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 1 Jun 2014 04:02:37 +0000 (21:02 -0700)]
tests: Add pullup filter test
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 15:54:28 +0000 (17:54 +0200)]
Merge commit '
f76e3669bb350ca6df150244f3d28d7dc5599f01 '
* commit '
f76e3669bb350ca6df150244f3d28d7dc5599f01 ':
Decode both parts of Indeo4 IP frames
Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h
See:
8bfb4d72dd9324fda14bb49dda3468ccba5873e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 15:39:21 +0000 (17:39 +0200)]
Merge commit '
3df0d20028cb9d2daca16ac0dc6c3ab77183da37 '
* commit '
3df0d20028cb9d2daca16ac0dc6c3ab77183da37 ':
Move Indeo4 frametypes into common header.
Conflicts:
libavcodec/ivi_common.c
See:
d24673a2c80418c3c14dad523619f44f3ca8cb58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 15:29:59 +0000 (17:29 +0200)]
ffmpeg_opt: fix ffserver with the 2 encoder contexts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 15:08:17 +0000 (17:08 +0200)]
ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 14:52:10 +0000 (16:52 +0200)]
ffmpeg: Fix encoder names in printout
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 14:36:43 +0000 (16:36 +0200)]
ffmpeg_opt: fix attachment streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 14:24:00 +0000 (16:24 +0200)]
ffmpeg: fix for-muxer AVCodecContext stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 14:06:18 +0000 (16:06 +0200)]
ffmpeg_filter: fix choose_pix_fmts() so it uses the correct encoding context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 13:40:47 +0000 (15:40 +0200)]
Merge commit '
383136264ef40452efd86cafb2d7221cd3830b3d '
* commit '
383136264ef40452efd86cafb2d7221cd3830b3d ':
avconv: do not use the stream codec context for encoding
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 13:32:50 +0000 (15:32 +0200)]
ffmpeg: add note about why has_b_frame is copied and when it can be removed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 12:53:34 +0000 (14:53 +0200)]
ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 13:20:28 +0000 (15:20 +0200)]
ffmpeg: copy b frame codec delay back from decoder to demuxer
The demuxer needs this value to generate correct timestamps in some corner cases
Ideally the parser would always set this correctly, but some parsers lac support
for extracting this value, also its not trivial.
This fixes a regression
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 12:35:53 +0000 (14:35 +0200)]
Merge commit '
41776ba9c0ebbb71394cefdf7dd1b243e6c852d5 '
* commit '
41776ba9c0ebbb71394cefdf7dd1b243e6c852d5 ':
avconv: do not use the stream codec context for decoding
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 12:16:29 +0000 (14:16 +0200)]
Merge commit '
e19d48dfce52f1417f7f06143b96fed00cbcdc52 '
* commit '
e19d48dfce52f1417f7f06143b96fed00cbcdc52 ':
flac muxer: support reading updated extradata from side data
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 12:02:25 +0000 (14:02 +0200)]
Merge commit '
0097cbea695e534fce39958ccd103af2fbf65831 '
* commit '
0097cbea695e534fce39958ccd103af2fbf65831 ':
flac muxer: accept only STREAMINFO extradata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 11:55:03 +0000 (13:55 +0200)]
Merge commit '
ed39cda02923316b6710c1bcc34d3445370be5b4 '
* commit '
ed39cda02923316b6710c1bcc34d3445370be5b4 ':
flacenc: send final extradata in packet side data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 11:46:38 +0000 (13:46 +0200)]
Merge commit '
0957b274e312e985d69cb490bee2a7ff820acaa6 '
* commit '
0957b274e312e985d69cb490bee2a7ff820acaa6 ':
lavc: add an option to enable side data-only packets during encoding
Conflicts:
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 11:35:17 +0000 (13:35 +0200)]
Merge commit '
eb800f120d2d42590fde2302fe828c847e41e773 '
* commit '
eb800f120d2d42590fde2302fe828c847e41e773 ':
libavcodec: set AVFrame colorspace fields on decoding
Conflicts:
libavcodec/utils.c
See:
a80e622924c89df69fb1c225ba432fe12fe6648e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 11:06:21 +0000 (13:06 +0200)]
Merge commit '
8c02adc62d71dfbb079a04753d8c16152c49de88 '
* commit '
8c02adc62d71dfbb079a04753d8c16152c49de88 ':
lavu: add all color-related enums to AVFrame
Conflicts:
libavcodec/avcodec.h
libavutil/frame.c
libavutil/frame.h
libavutil/version.h
The version check is changed so they are available with the current ABI
FFmpeg libs should have no problems with added fields, nor should any
application using the libs, and we regularly added fields in the past.
We also moved 2 of these fields to AVFrame already previously without issues.
See:
a80e622924c89df69fb1c225ba432fe12fe6648e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 10:28:56 +0000 (12:28 +0200)]
avcodec/cljr: require (v)strict -1 to use width %4 != 0
Suggested-by: kurosu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 09:57:43 +0000 (11:57 +0200)]
Merge commit '
d2ef708c95ace2518deffe830a9c439aeb9edd5d '
* commit '
d2ef708c95ace2518deffe830a9c439aeb9edd5d ':
matroskaenc: Allow VP9 and Opus in webm
Conflicts:
libavformat/matroskaenc.c
See:
820ffaed0f64b7ec27275d093c6f81e181c86e94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Dirk Ausserhaus [Thu, 29 May 2014 11:30:37 +0000 (13:30 +0200)]
Decode both parts of Indeo4 IP frames
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Dirk Ausserhaus [Thu, 29 May 2014 11:17:49 +0000 (13:17 +0200)]
Move Indeo4 frametypes into common header.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Anton Khirnov [Sat, 5 Apr 2014 06:48:24 +0000 (08:48 +0200)]
avconv: do not use the stream codec context for encoding
Anton Khirnov [Sat, 5 Apr 2014 06:48:24 +0000 (08:48 +0200)]
avconv: do not use the stream codec context for decoding
Anton Khirnov [Mon, 26 May 2014 20:14:14 +0000 (22:14 +0200)]
flac muxer: support reading updated extradata from side data
Anton Khirnov [Mon, 26 May 2014 13:51:22 +0000 (15:51 +0200)]
flac muxer: accept only STREAMINFO extradata
The other format (full flac header blocks) should not be exported by any
demuxers anymore.
This allows to drop an avpriv_ function and also simplify the following
commits.
Anton Khirnov [Tue, 29 Apr 2014 13:11:30 +0000 (15:11 +0200)]
flacenc: send final extradata in packet side data
Anton Khirnov [Tue, 29 Apr 2014 13:06:45 +0000 (15:06 +0200)]
lavc: add an option to enable side data-only packets during encoding
Some encoders (e.g. flac) need to send side data when there is no more
data to be output. This enables them to output a packet with no data in
it, only side data.
wm4 [Fri, 30 May 2014 20:14:22 +0000 (22:14 +0200)]
libavcodec: set AVFrame colorspace fields on decoding
Signed-off-by: Anton Khirnov <anton@khirnov.net>
wm4 [Fri, 30 May 2014 20:14:21 +0000 (22:14 +0200)]
lavu: add all color-related enums to AVFrame
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tudor Suciu [Sun, 2 Jun 2013 15:49:24 +0000 (17:49 +0200)]
matroskaenc: Allow VP9 and Opus in webm
Bug-Id: 695
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sun, 1 Jun 2014 01:57:17 +0000 (03:57 +0200)]
avcodec/mjpegenc: disallow encoding amv with height%16!=0
I do not know on which side to place the padding to encode with 16x16 MBs
If someone knows or has a known to be correct sample, please contact me
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jun 2014 01:53:19 +0000 (03:53 +0200)]
avcodec/mjpegdec: request a AMV sample with non mod 16 height
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 31 May 2014 19:36:45 +0000 (16:36 -0300)]
x86/motion_est: enable sad16_sse2 on k10 CPUs
The check is meant for k8 CPUs. sad16_sse2 is ~20% faster than sad16_mmxext on k10.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 May 2014 21:52:50 +0000 (23:52 +0200)]
avcodec/cljr: support width%4 encoding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 May 2014 20:19:13 +0000 (22:19 +0200)]
avcodec/cljr: remove coded_frame code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 31 May 2014 17:25:03 +0000 (14:25 -0300)]
lavc/dsputil: add missing vsad8 and vsse8 functions
the mpeg encoder would try to use them if vsad or vsse were selected for frame_skip_cmp
and frame_skip_threshold or frame_skip_factor were set to values != 0
example: "ffmpeg -i INPUT -c:v mpeg2video -skipcmp vsad -skip_threshold 1 -f null -"
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 May 2014 15:24:18 +0000 (17:24 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Read mov files where the moov atom is hidden within a free atom.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 May 2014 15:07:12 +0000 (17:07 +0200)]
avcodec/asvenc: fix encoding dimensions %16 != 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 May 2014 15:06:26 +0000 (17:06 +0200)]
avutil/frame: frame_copy_video: support copying from a smaller to a larger frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 May 2014 14:26:46 +0000 (16:26 +0200)]
avcodec/snow: fix 1 pixel block sizes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 31 May 2014 13:39:35 +0000 (15:39 +0200)]
Read mov files where the moov atom is hidden within a free atom.
Fixes ticket #1551 / issue 2226.
Carl Eugen Hoyos [Sat, 31 May 2014 14:27:48 +0000 (16:27 +0200)]
Fix compilation with --disable-everything --enable-demuxer=matroska.
Fixes ticket #3693.
Carl Eugen Hoyos [Sat, 31 May 2014 11:29:07 +0000 (13:29 +0200)]
lavc/jpeglsenc: Enable frame-threading.
Carl Eugen Hoyos [Sat, 31 May 2014 11:28:35 +0000 (13:28 +0200)]
lavc/lclenc: Enable frame-threading.
Carl Eugen Hoyos [Sat, 31 May 2014 11:28:16 +0000 (13:28 +0200)]
lavc/ljpegenc: Enable frame-threading.
Carl Eugen Hoyos [Sat, 31 May 2014 11:27:51 +0000 (13:27 +0200)]
lavc/tiffenc: Enable frame-threading.