Michael Niedermayer
2c9fc694f5
Merge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed'
...
* commit '09cb75cdeba420d680bcb165a1ef668d8f381fed':
libx264: set frame packing information when relevant information is found
Conflicts:
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
be6e81463c
Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'
...
* commit '5b10ef729f610fcbc9c485e7b643ce53268144cb':
h264: parse frame packing arrangement SEI messages and save relevant stereo3d information
Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7a60348053
Merge commit '7e244c68600f479270e979258e389ed5240885fb'
...
* commit '7e244c68600f479270e979258e389ed5240885fb':
avframe: add codec-independent stereoscopic metadata
Conflicts:
Changelog
libavutil/Makefile
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lenny Wang
64f73acd1d
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
...
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8e702bd3a8
Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'
...
* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
configure: Prefix libc-related variables with "libc_"
Conflicts:
libavdevice/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c9afeda55e
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Fix remuxing of IMA_QT in mov.
Do not detect "00000000..." (and other non-changing values) as adp.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3a5cbc91a4
Merge commit '61b203ffe6c71789acb14f51483d63fe9e516842'
...
* commit '61b203ffe6c71789acb14f51483d63fe9e516842':
configure: detect Solaris libc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8c677a9f06
Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'
...
* commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c':
avcodec: Use av_reallocp where suitable
Conflicts:
libavcodec/bitstream.c
libavcodec/eatgv.c
libavcodec/flashsv.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
94a849b8b6
Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'
...
* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8':
dv: use AVFrame API properly
Conflicts:
libavcodec/dvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
785066ae8a
Merge commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0'
...
* commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0':
ac3dec: make drc_scale exponentially
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7a901eb33a
Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'
...
* commit '37a749012aaacc801fe860428417a6d7b81c103f':
lavc: rework handling of refcounted_frames=0
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
58f70f1701
Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'
...
* commit 'df7aba52b51007db50410abe15fe28391abd8757':
frame: cosmetics, reindent
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3f5f955c53
Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'
...
* commit 'c342132fa8a29692e28c98238e3a31da5c407e42':
frame: copy flags in av_frame_copy_props()
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f3acdd44bf
Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'
...
* commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8':
lavc/decode_video(): always unref the frame if there is no output in decode_video
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
04dac5d1e0
Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'
...
* commit '85f947aefb3dae81f65f518acdffa8e31c679654':
lavc: remove a pointless check in decode_audio4()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f4332e9591
Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'
...
* commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56':
lavc: use buf[0] instead of data[0] as the indicator of an allocated frame
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Vittorio Giovara
09cb75cdeb
libx264: set frame packing information when relevant information is found
11 years ago
Vittorio Giovara
5b10ef729f
h264: parse frame packing arrangement SEI messages and save relevant stereo3d information
11 years ago
Vittorio Giovara
7e244c6860
avframe: add codec-independent stereoscopic metadata
11 years ago
Michael Niedermayer
cefabaad3e
Merge commit 'e5419709f50593769037ab77d7102f82d9260784'
...
* commit 'e5419709f50593769037ab77d7102f82d9260784':
lavc: remove the extended_data workarounds.
Conflicts:
libavcodec/utils.c
One hunk is not merged as not all codecs are updated yet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
362383b743
Fix remuxing of IMA_QT in mov.
...
Fixes ticket #1603 .
11 years ago
Carl Eugen Hoyos
c5a837658a
Do not detect "00000000..." (and other non-changing values) as adp.
11 years ago
Michael Niedermayer
45fd4ec9ef
Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'
...
* commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac':
pthread_frame: use the AVFrame API properly.
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
b8667bccad
Revert: flvenc: Don't pretend to support muxing "plain" VP6
...
Muxing VP6 is used by applications and works with Flashplayer.
Reported-by: David Bertrand
11 years ago
Michael Niedermayer
8947f47fdf
Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'
...
* commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c':
mxpegdec: use the AVFrame API properly.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
37945584bf
Merge commit 'afa21a12bf084f905187615706b0a8d92bc98661'
...
* commit 'afa21a12bf084f905187615706b0a8d92bc98661':
p*menc: use the AVFrame API properly.
Conflicts:
libavcodec/Makefile
libavcodec/pamenc.c
libavcodec/pnmenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6393038676
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
...
* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
mjpegdec: use the AVFrame API properly.
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
anatoly
2fade10cb0
Add support for picture_ptr field in MJpegDecodeContext
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit e0e3b8b297
)
Conflicts:
libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9eac7c435f
Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'
...
* commit 'f0b234ab9e406efee85c17eb435db646092a943b':
avformat: AviSynth demuxer rewrite
Conflicts:
configure
libavformat/avisynth.c
See: b9ad009475
(as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
d64341e498
configure: Prefix libc-related variables with "libc_"
...
Simplifies host/target libc detection splitting.
11 years ago
Sean McGovern
61b203ffe6
configure: detect Solaris libc
...
Add preprocessor flags for API availability as necessary.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
Alexandra Khirnova
9b8d11a76a
avcodec: Use av_reallocp where suitable
...
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Anton Khirnov
d4f1188d1a
dv: use AVFrame API properly
11 years ago
John Stebbins
c9ca220ef2
ac3dec: make drc_scale exponentially
...
The a52 spec suggests that "partial compression" should scale the
drc value in this manner.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Anton Khirnov
37a749012a
lavc: rework handling of refcounted_frames=0
...
Use only proper AVFrame API (no assigning of whole frames, since that
hardcodes sizeof(AVFrame) into lavc).
Make a copy of the side data, so the caller can use av_frame_unref/free
on non-refcounted frames, eliminating the need for
avcodec_get_frame_defaults()/avcodec_free_frame().
11 years ago
Anton Khirnov
df7aba52b5
frame: cosmetics, reindent
11 years ago
Anton Khirnov
c342132fa8
frame: copy flags in av_frame_copy_props()
...
Flags can be considered metadata (at least those that are defined now).
11 years ago
Anton Khirnov
a1ee164869
lavc/decode_video(): always unref the frame if there is no output in decode_video
...
Not just on failure. This is the same thing that is done in the audio
path and should prevent leaks in decoders that allocate a frame, but
then end up not writing into it.
11 years ago
Anton Khirnov
85f947aefb
lavc: remove a pointless check in decode_audio4()
...
av_frame_unref() works fine on unallocated frames.
11 years ago
Anton Khirnov
d4f0f2d1e8
lavc: use buf[0] instead of data[0] as the indicator of an allocated frame
...
data[0] may be NULL for valid frames with hwaccel pixel formats.
11 years ago
Anton Khirnov
e5419709f5
lavc: remove the extended_data workarounds.
...
All decoders should now handle it properly.
11 years ago
Anton Khirnov
d351ef47d0
pthread_frame: use the AVFrame API properly.
...
Remove the extended_data workaround, all decoders should now handle this
properly.
11 years ago
Anton Khirnov
b605b123ef
mxpegdec: use the AVFrame API properly.
11 years ago
Anton Khirnov
afa21a12bf
p*menc: use the AVFrame API properly.
11 years ago
Anton Khirnov
e2274aa555
mjpegdec: use the AVFrame API properly.
11 years ago
Michael Niedermayer
2d4ef7c905
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Move adding of compat objects out of libc detection
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8e70fdab36
Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'
...
* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
dsputil: Move apply_window_int16 to ac3dsp
Conflicts:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/x86/ac3dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
a12f679a5d
common.mak: Less ugly version of the previous windres fix
...
Using subst here is a really ugly hack
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
0cde2ae3f1
configure: Move MinGW64 specific check to the correct place
...
It was misplaced during merge of commit 120797e2ef
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
5f302b1f38
common.mak: fix the current fate failures with windres
...
Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago