Michael Niedermayer
ec1ed64506
avcodec/cljr: require (v)strict -1 to use width %4 != 0
...
Suggested-by: kurosu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 12:43:47 +02:00
Michael Niedermayer
754bf1212c
Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'
...
* commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d':
matroskaenc: Allow VP9 and Opus in webm
Conflicts:
libavformat/matroskaenc.c
See: 820ffaed0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 12:00:20 +02:00
Tudor Suciu
d2ef708c95
matroskaenc: Allow VP9 and Opus in webm
...
Bug-Id: 695
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-06-01 07:50:00 +02:00
Michael Niedermayer
181b2c3724
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>
2014-06-01 04:00:47 +02:00
Michael Niedermayer
149be91374
avcodec/mjpegdec: request a AMV sample with non mod 16 height
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 04:00:47 +02:00
James Almer
e1bd40fe6b
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>
2014-06-01 02:10:32 +02:00
Michael Niedermayer
6dc709f0f5
avcodec/cljr: support width%4 encoding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 00:48:48 +02:00
Michael Niedermayer
59a70422b1
avcodec/cljr: remove coded_frame code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 00:48:48 +02:00
James Almer
ac1077ab50
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>
2014-05-31 19:45:03 +02:00
Michael Niedermayer
28f7b81f9b
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>
2014-05-31 17:24:23 +02:00
Michael Niedermayer
e692c9672b
avcodec/asvenc: fix encoding dimensions %16 != 0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31 17:16:44 +02:00
Michael Niedermayer
879aa062f9
avutil/frame: frame_copy_video: support copying from a smaller to a larger frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31 17:16:44 +02:00
Michael Niedermayer
e868f84e83
avcodec/snow: fix 1 pixel block sizes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31 17:16:44 +02:00
Carl Eugen Hoyos
26b0d7198e
Read mov files where the moov atom is hidden within a free atom.
...
Fixes ticket #1551 / issue 2226.
2014-05-31 16:57:27 +02:00
Carl Eugen Hoyos
aab2e939a9
Fix compilation with --disable-everything --enable-demuxer=matroska.
...
Fixes ticket #3693 .
2014-05-31 16:29:02 +02:00
Carl Eugen Hoyos
e91e626182
lavc/jpeglsenc: Enable frame-threading.
2014-05-31 13:41:11 +02:00
Carl Eugen Hoyos
64afc3bb93
lavc/lclenc: Enable frame-threading.
2014-05-31 13:41:10 +02:00
Carl Eugen Hoyos
cdfe06aeb2
lavc/ljpegenc: Enable frame-threading.
2014-05-31 13:41:10 +02:00
Carl Eugen Hoyos
b91bf48f00
lavc/tiffenc: Enable frame-threading.
2014-05-31 13:41:10 +02:00
Carl Eugen Hoyos
c528d833a9
lavc/utvideoenc: Enable frame-threading.
2014-05-31 13:41:10 +02:00
Carl Eugen Hoyos
6e67852881
Use rc_max_rate in av_find_best_stream() if bitrate == 0.
...
Fixes ticket #2042 .
2014-05-31 13:41:10 +02:00
John Peebles
925f7980eb
libavformat: output cues for each subtitle block in MKV muxer
...
Signed-off-by: John Peebles <johnpeeb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31 13:26:48 +02:00
Michael Niedermayer
9c22e909ed
Revert "avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810db036628e11a5171134ebe320b187ee6d6"
...
This has become unneeded due to f797b134ca
This reverts commit 1fe40e1b05
.
2014-05-31 12:54:00 +02:00
Michael Niedermayer
8c895ae73f
Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'
...
* commit 'f797b134cad4d248b1c8955659997980d0668bc3':
rtpenc_chain: Don't copy the time base to the source stream by default
See: 1fe40e1b05
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31 12:53:46 +02:00
Martin Storsjö
f797b134ca
rtpenc_chain: Don't copy the time base to the source stream by default
...
Only copy it manually in the muxers where it makes sense (rtspenc,
sapenc). Don't touch the original AVStream in movenchint, where
the original AVStream should be kept untouched.
This fixes the normal tracks in RTP hinted files after
abb810db
- the hint tracks were ok while the normal media tracks
were broken, noticed by Michael Niedermayer.
This reverts abb810db
but achieves the same effect for the other
muxers.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-31 12:02:23 +03:00
Christophe Gisquet
4ba8560077
huffyuv: increase VLC_BITS to 12
...
May require a different tuning for arm chips?
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31 04:26:41 +02:00
Michael Niedermayer
2e532aa82d
avformat/flvenc: fix assertion failure after 4h muxing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31 01:43:41 +02:00
James Almer
f128342df2
build: fix compilation of svq1enc_mmx.c with --disable-mmx
...
It's needed for ff_svq1enc_init_x86() even if simd functions are disabled.
Alternatively, svq1enc_init.c could be made and the relevant code moved there.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31 00:38:24 +02:00
James Almer
4ac41a52e2
x86/huffyuvdsp: fix some prototypes
...
Remove duplicate prototypes and fix int -> intptr_t in another
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31 00:29:00 +02:00
Michael Niedermayer
83b8987df7
Merge commit 'd6d767d93e532246cacf3567e6bcad76a821f838'
...
* commit 'd6d767d93e532246cacf3567e6bcad76a821f838':
ppc: Fix compilation for ppc64le (ELFv2)
Conflicts:
libavcodec/ppc/asm.S
See: 41b928c5fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 23:15:20 +02:00
Michael Niedermayer
1fe40e1b05
avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810db03
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 22:52:24 +02:00
Michael Niedermayer
692757062a
Merge commit 'abb810db036628e11a5171134ebe320b187ee6d6'
...
* commit 'abb810db036628e11a5171134ebe320b187ee6d6':
Revert "rtpenc_chain: Don't copy the time_base back to the caller"
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 22:03:51 +02:00
Thierry Fauck
d6d767d93e
ppc: Fix compilation for ppc64le (ELFv2)
...
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-30 22:46:53 +03:00
Martin Storsjö
abb810db03
Revert "rtpenc_chain: Don't copy the time_base back to the caller"
...
While it strictly isn't necessary to copy the time base (since
any use of it is scaled in ff_write_chained), it still is better
to signal the actual time base to the caller, avoiding one
unnecessary rescaling. This also lets the caller know what the
actual internal time base is, in case that is useful info
for some caller.
This reverts commit 397ffde115
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-30 22:45:42 +03:00
Christophe Gisquet
d136fe6fd7
x86: huffyuvdsp: fewer functions for x86_64
...
When there are 2 functions that are <= SSE2, only one is needed for x86_64.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 21:39:06 +02:00
Michael Niedermayer
e0d0745560
avcodec/options: leave priv_data in avcodec_copy_context() intact
...
previously it was freed but the pointer not cleared
Found-by: ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 21:24:55 +02:00
Michael Niedermayer
82efa24c51
avcodec/proresenc_anatoliy: simplify get()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 18:49:25 +02:00
Michael Niedermayer
f6b1cd3936
avcodec/proresenc_anatoliy: load 4 samples at a time in get()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 18:49:25 +02:00
Michael Niedermayer
63b4d6feb8
avcodec/proresenc_anatoliy: Use fdct from DSPContext instead of direct call.
...
Based-on: a55546f48d
by Diego Biurrun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 18:49:25 +02:00
Michael Niedermayer
e263af3024
avcodec/proresenc_anatoliy: Set bits_per_raw_sample
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 18:49:25 +02:00
Michael Niedermayer
8716605a26
avformat/nutenc: Suggest genpts if AV_NOPTS_VALUE
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 18:49:25 +02:00
Carl Eugen Hoyos
3ea0d9c8a5
Fix VDPAU decoders, regression since f2f99f07
.
2014-05-30 17:34:26 +02:00
Timothy Gu
154cee9292
x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 16:57:52 +02:00
Timothy Gu
0b6292b7b8
x86: dsputilenc: move all the function prototypes together
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 16:18:10 +02:00
Timothy Gu
bfb4882345
tests: Add MPEG4 nsse test
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 15:43:04 +02:00
Christophe Gisquet
f743fa9c7f
x86: huffyuvdsp: add_hfyu_left_pred_bgr32
...
C MMX SSE2
Cycles: 3092 1053 578
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 15:20:36 +02:00
Michael Niedermayer
7be79c76d3
avcodec/huffyuvdsp: Change w to intptr in add_hfyu_median_pred() and add_hfyu_left_pred()
...
This avoids potential issues with the high 32bits being random in x86-64 asm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 15:12:58 +02:00
Christophe Gisquet
884078d2df
x86: huffyuvdsp: add SSE2 median prediction
...
From 5010c to 4566 on lagarith YUY2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 14:57:57 +02:00
Michael Niedermayer
b3dfebd641
avformat/matroskadec: fix off by 1 error in matroska_read_seek()
...
Fixes out of array read
Fixes: vp9-opus-crash.webm
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 13:55:03 +02:00
Dirk Ausserhaus
8bfb4d72dd
avcodec/indeo4: Decode both parts of IP frames
...
Fixes part of Ticket845
av_frame_move_ref() idea by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30 13:49:42 +02:00