Michael Niedermayer
bec180e112
Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'
...
* commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93': (21 commits)
cmdutils: fix a memleak when specifying an option twice.
x86: mpegvideo: more sensible names for optimization file and init function
x86: mpegvideoenc: Split optimizations off into a separate file
dnxhdenc: x86: more sensible names for optimization file and init function
svq1/svq3: Move common code out of SVQ1 decoder-specific file
dirac: add Comments and references to the standard
lavr: x86: optimized 6-channel flt to fltp conversion
lavr: x86: optimized 2-channel flt to fltp conversion
lavr: x86: optimized 6-channel flt to s16p conversion
lavr: x86: optimized 2-channel flt to s16p conversion
lavr: x86: optimized 6-channel s16 to fltp conversion
lavr: x86: optimized 2-channel s16 to fltp conversion
lavr: x86: optimized 6-channel s16 to s16p conversion
lavr: x86: optimized 2-channel s16 to s16p conversion
lavr: x86: optimized 2-channel fltp to flt conversion
lavr: x86: optimized 6-channel fltp to s16 conversion
lavr: x86: optimized 2-channel fltp to s16 conversion
lavr: x86: optimized 6-channel s16p to flt conversion
lavr: x86: optimized 2-channel s16p to flt conversion
lavr: x86: optimized 6-channel s16p to s16 conversion
...
Conflicts:
libavcodec/dirac.c
libavcodec/mpegvideo.h
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-24 14:30:40 +02:00
Michael Niedermayer
6b72615c32
rtpdec_xiph: switch to av_assert()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-24 13:44:25 +02:00
Stefano Sabatini
b66afe087a
lavfi/asetpts,setpts: rework debug log
...
Show more information, and only the information stored in the values
array. Improve debugging usefulness.
2012-08-24 13:32:59 +02:00
Stefano Sabatini
1181461ca5
lavfi/asetpts,setpts: add variables T, STARTT, PREV_INT and PREV_OUTT
2012-08-24 13:32:21 +02:00
Stefano Sabatini
3d6d59ef35
doc/filters: itemize examples for *settb filters
2012-08-24 12:54:45 +02:00
Stefano Sabatini
c45178cf5b
doc/filters: itemize examples for *setpts filters
2012-08-24 12:54:45 +02:00
Stefano Sabatini
0043db2967
doc/filters: move *setpts and *settb filters to the multimedia filters section
...
Since audio and video filters are explained together and share most code,
the multimedia filters section seems more fitting.
2012-08-24 12:54:45 +02:00
Stefano Sabatini
0b9a915dad
lavfi: rename vf_setpts.c to f_setpts.c
...
The file contains the asetpts audio filter.
2012-08-24 12:54:45 +02:00
Nicolas George
de60880543
lavc/dvdsubenc: check the type of rectangles.
...
Avoid a crash if a text rectangle is provided.
Fix the segfault reported in trac ticket #1661 .
2012-08-24 12:12:41 +02:00
Anton Khirnov
a1bcc76e60
cmdutils: fix a memleak when specifying an option twice.
2012-08-24 11:25:06 +02:00
Michael Niedermayer
12b1512e85
lavf/utils: Try to unwrap pts/dts so as to minimize wraps
...
Based on code by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-24 03:08:51 +02:00
Michael Niedermayer
254917f078
lavf/utils: run update_initial_timestamps() outside some if()
...
This way it gets executed earlier and updated timestamps become available earlier.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-24 03:07:03 +02:00
Diego Biurrun
dc40285427
x86: mpegvideo: more sensible names for optimization file and init function
2012-08-24 02:23:16 +02:00
Diego Biurrun
d211547ddd
x86: mpegvideoenc: Split optimizations off into a separate file
2012-08-24 02:23:16 +02:00
Diego Biurrun
26ce9aec03
dnxhdenc: x86: more sensible names for optimization file and init function
2012-08-24 02:23:15 +02:00
Diego Biurrun
f1e06d37c9
svq1/svq3: Move common code out of SVQ1 decoder-specific file
2012-08-24 02:23:15 +02:00
Jordi Ortiz
43da682c87
dirac: add Comments and references to the standard
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-08-24 02:23:14 +02:00
Justin Ruggles
06e751a40f
lavr: x86: optimized 6-channel flt to fltp conversion
2012-08-23 20:10:57 -04:00
Justin Ruggles
e07c9705c8
lavr: x86: optimized 2-channel flt to fltp conversion
2012-08-23 20:10:57 -04:00
Justin Ruggles
5245c9f3ad
lavr: x86: optimized 6-channel flt to s16p conversion
2012-08-23 20:10:57 -04:00
Justin Ruggles
31d0d7181d
lavr: x86: optimized 2-channel flt to s16p conversion
2012-08-23 20:10:57 -04:00
Justin Ruggles
6092dafb5a
lavr: x86: optimized 6-channel s16 to fltp conversion
2012-08-23 20:10:57 -04:00
Justin Ruggles
91851a7b37
lavr: x86: optimized 2-channel s16 to fltp conversion
2012-08-23 20:10:57 -04:00
Justin Ruggles
205ace8843
lavr: x86: optimized 6-channel s16 to s16p conversion
2012-08-23 20:10:57 -04:00
Justin Ruggles
8eeffa8ada
lavr: x86: optimized 2-channel s16 to s16p conversion
2012-08-23 20:10:57 -04:00
Justin Ruggles
b66e20d2aa
lavr: x86: optimized 2-channel fltp to flt conversion
2012-08-23 20:10:56 -04:00
Justin Ruggles
d5b4e50c47
lavr: x86: optimized 6-channel fltp to s16 conversion
2012-08-23 20:10:56 -04:00
Justin Ruggles
a58a013980
lavr: x86: optimized 2-channel fltp to s16 conversion
2012-08-23 20:10:56 -04:00
Justin Ruggles
90cc27f813
lavr: x86: optimized 6-channel s16p to flt conversion
2012-08-23 20:10:56 -04:00
Justin Ruggles
46f929adad
lavr: x86: optimized 2-channel s16p to flt conversion
2012-08-23 20:10:56 -04:00
Justin Ruggles
13df7d2d40
lavr: x86: optimized 6-channel s16p to s16 conversion
2012-08-23 20:10:56 -04:00
Justin Ruggles
c0e12535aa
lavr: x86: optimized 2-channel s16p to s16 conversion
2012-08-23 20:10:56 -04:00
Michael Niedermayer
91c18beb9d
ffmpeg: fix wrap correction code.
...
The code failed with negative timestamps due to using unsigned numbers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-24 01:39:32 +02:00
Michael Niedermayer
168ddcd331
mjpeg: fix fliping with emu edges.
...
Fixes Ticket121
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-23 21:53:10 +02:00
Joseph Artsimovich
628e6d0164
Fix partially hidden macroblocks for 10-bit DNxHD.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-23 20:09:57 +02:00
Georg Lippitsch
15acfa21fc
ffv1: more than 8 bit per RGB channel
...
Add support for GBRP9, GBRP10, GBRP12 and GBRP14 pix formats in ffv1.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-23 19:44:43 +02:00
Michael Niedermayer
2b3b52d519
lagarith: fix alignment on buffers passed into prediction dsp code.
...
This should fix issues with direct rendering
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-23 19:03:57 +02:00
jamal
732dfc7660
lavf/ape: Fix stream duration calculation
...
Fixes ticket #1662
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-23 15:51:51 +02:00
Michael Niedermayer
599a4e0771
mpeg4audio: dont take the SBR flag too serious.
...
Fixes Ticket1049
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-23 14:43:12 +02:00
Michael Niedermayer
104f42e694
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc/APIchanges: add an entry for codec descriptors.
vorbisenc: set AVCodecContext.bit_rate to 0
vorbisenc: fix quality parameter
FATE: add ALAC encoding tests
lpc: fix alignment of windowed samples for odd maximum LPC order
alacenc: use s16p sample format as input
alacenc: remove unneeded sample_fmt check
alacenc: fix max_frame_size calculation for the final frame
adpcm_swf: Use correct sample offsets when using trellis.
rtmp: support strict rtmp servers
mjpegdec: support AVRn interlaced
x86: remove FASTDIV inline asm
Conflicts:
doc/APIchanges
libavcodec/mjpegdec.c
libavcodec/vorbisenc.c
libavutil/x86/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-23 14:33:33 +02:00
Anton Khirnov
7b44061f4b
doc/APIchanges: add an entry for codec descriptors.
...
Also fill in missing dates and hashes.
2012-08-23 08:51:04 +02:00
Justin Ruggles
a0a5fed908
vorbisenc: set AVCodecContext.bit_rate to 0
...
The Vorbis encoder is always VBR.
2012-08-22 19:58:46 -04:00
Justin Ruggles
890fddd0ea
vorbisenc: fix quality parameter
...
This generates output with bitrates similar to libvorbis for a given quality
value.
2012-08-22 19:58:39 -04:00
Nicolas George
c2271fa7f9
lavfi: free partial audio buffers when destroying links.
...
Fix a memleak that the recent change of architecture made
more likely to happen.
2012-08-22 23:31:49 +02:00
Justin Ruggles
e981215944
FATE: add ALAC encoding tests
2012-08-22 16:41:57 -04:00
Justin Ruggles
4b0e0f31bf
lpc: fix alignment of windowed samples for odd maximum LPC order
...
Fixes crash on x86 due to alignment requirements for w_data in
lpc_apply_welch_window_sse2().
2012-08-22 16:41:50 -04:00
Justin Ruggles
f24cc1b2f1
alacenc: use s16p sample format as input
2012-08-22 16:41:41 -04:00
Justin Ruggles
358078d9bb
alacenc: remove unneeded sample_fmt check
2012-08-22 16:41:33 -04:00
Justin Ruggles
ec7a212f9f
alacenc: fix max_frame_size calculation for the final frame
2012-08-22 16:41:23 -04:00
Derek Buitenhuis
081a822b6c
FATE: Add Canopus Lossless tests
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-22 22:33:59 +02:00