Michael Niedermayer [Mon, 24 Mar 2014 18:58:05 +0000 (19:58 +0100)]
avcodec/h264: use ff_h264_set_erpic() instead of memset
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 18:50:39 +0000 (19:50 +0100)]
ffmpeg: move packet deallocation into write_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 15:45:29 +0000 (16:45 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: don't warn on multiple frames per packet for codecs that expect it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 15:40:35 +0000 (16:40 +0100)]
Merge commit '
4754345027eb85cfa51aeb88beec68d7b036c11e'
* commit '
4754345027eb85cfa51aeb88beec68d7b036c11e':
avconv: print verbose per-stream transcoding statistics
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 15:25:31 +0000 (16:25 +0100)]
Merge commit '
a220b07b0f971f88213aef012aea51af2800be62'
* commit '
a220b07b0f971f88213aef012aea51af2800be62':
avconv: split printing the final statistics into a separate function
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Sun, 23 Mar 2014 14:31:06 +0000 (14:31 +0000)]
libx265: Only use one memcpy for headers
They're guaranteed by the x265 API to be contiguous in memory.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 23 Mar 2014 14:39:46 +0000 (14:39 +0000)]
libx265: Simple cosmetic fix
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Mon, 24 Mar 2014 15:08:01 +0000 (16:08 +0100)]
Merge commit '
baeb59d89beda499688e528c6a269d2b255b66f2'
* commit '
baeb59d89beda499688e528c6a269d2b255b66f2':
avconv: rewrite output data size tracking
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 14:48:19 +0000 (15:48 +0100)]
Merge commit '
f759f66e367bc62ed7738a51040f775b656a60d8'
* commit '
f759f66e367bc62ed7738a51040f775b656a60d8':
avconv: explicitly report when the muxing overhead is unknown
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 14:45:47 +0000 (15:45 +0100)]
Merge commit '
781d97fd54b1f0d8f4f7536dbd932dca6445476e'
* commit '
781d97fd54b1f0d8f4f7536dbd932dca6445476e':
avconv: remove unused nb_frames_dup
Conflicts:
ffmpeg.c
No change, as the variable is not unused
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 14:32:48 +0000 (15:32 +0100)]
Merge commit '
b4679ecdbd80ae050094733f137ccd7ebf1316ab'
* commit '
b4679ecdbd80ae050094733f137ccd7ebf1316ab':
{v,a}f_showinfo: print frame side data
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 14:11:08 +0000 (15:11 +0100)]
Merge commit '
15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'
* commit '
15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7':
mp3dec: export replaygain tags from ID3v2
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 14:04:47 +0000 (15:04 +0100)]
Merge commit '
06c3cd3c0186803619bc6aad2d8f06c3e9015d15'
* commit '
06c3cd3c0186803619bc6aad2d8f06c3e9015d15':
af_volume: support using replaygain frame side data
Conflicts:
doc/filters.texi
libavfilter/af_volume.c
libavfilter/af_volume.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 13:51:44 +0000 (14:51 +0100)]
Merge commit '
d161ae0a37900cbd36c1390ca32a56b892c02ab5'
* commit '
d161ae0a37900cbd36c1390ca32a56b892c02ab5':
frame: add a function for removing side data from a frame
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 13:44:22 +0000 (14:44 +0100)]
Merge commit '
59444c76e6d43529a12dbd80b6dd29c6ba4079a9'
* commit '
59444c76e6d43529a12dbd80b6dd29c6ba4079a9':
avconv: add stream-global side data to the first demuxed packet
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 13:26:17 +0000 (14:26 +0100)]
Merge commit '
4a0f6651434c6f213d830140f575b4ec7858519f'
* commit '
4a0f6651434c6f213d830140f575b4ec7858519f':
libavcodec: when decoding, copy replaygain side data to decoded frames
Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 13:03:55 +0000 (14:03 +0100)]
Merge commit '
5a7e35dd2351c30bab45177b9482cb8833a0ca78'
* commit '
5a7e35dd2351c30bab45177b9482cb8833a0ca78':
Add replaygain side data type and code for parsing replaygain tags.
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 12:41:49 +0000 (13:41 +0100)]
Merge commit '
25b32586566f285d797737863c97a1c5c9c84e2b'
* commit '
25b32586566f285d797737863c97a1c5c9c84e2b':
lavf: add an AVStream field for exporting stream-global side data
Conflicts:
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 12:27:33 +0000 (13:27 +0100)]
Merge commit '
0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'
* commit '
0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
lavc: give a typedeffed name to the AVPacket.side_data struct
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 17 Mar 2014 10:14:14 +0000 (11:14 +0100)]
avconv: don't warn on multiple frames per packet for codecs that expect it
Anton Khirnov [Mon, 17 Mar 2014 09:58:05 +0000 (10:58 +0100)]
avconv: print verbose per-stream transcoding statistics
Anton Khirnov [Mon, 17 Mar 2014 09:09:09 +0000 (10:09 +0100)]
avconv: split printing the final statistics into a separate function
Anton Khirnov [Mon, 17 Mar 2014 09:03:47 +0000 (10:03 +0100)]
avconv: rewrite output data size tracking
Store a variable per OutputStream instead of globals for
audio/video/extradata. This makes the code simpler and cleaner and fixes
2pass with multiple output streams.
Anton Khirnov [Mon, 17 Mar 2014 09:00:38 +0000 (10:00 +0100)]
avconv: explicitly report when the muxing overhead is unknown
Anton Khirnov [Mon, 17 Mar 2014 06:15:02 +0000 (07:15 +0100)]
avconv: remove unused nb_frames_dup
Frame duplication now happens in vf_fps.
Anton Khirnov [Wed, 19 Feb 2014 17:48:15 +0000 (18:48 +0100)]
{v,a}f_showinfo: print frame side data
Anton Khirnov [Wed, 19 Feb 2014 20:02:12 +0000 (21:02 +0100)]
mp3dec: export replaygain tags from ID3v2
Michael Niedermayer [Mon, 24 Mar 2014 05:07:28 +0000 (06:07 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Remove dcbzl check for e500v1 and e500v2 architectures
See:
d5733936d857ce5c7d28c0bc9e89a2e2548f8895
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 19 Feb 2014 20:01:37 +0000 (21:01 +0100)]
af_volume: support using replaygain frame side data
Anton Khirnov [Wed, 19 Feb 2014 19:11:21 +0000 (20:11 +0100)]
frame: add a function for removing side data from a frame
Anton Khirnov [Wed, 19 Feb 2014 17:49:48 +0000 (18:49 +0100)]
avconv: add stream-global side data to the first demuxed packet
Anton Khirnov [Wed, 19 Feb 2014 17:52:26 +0000 (18:52 +0100)]
libavcodec: when decoding, copy replaygain side data to decoded frames
Anton Khirnov [Wed, 19 Feb 2014 14:29:06 +0000 (15:29 +0100)]
Add replaygain side data type and code for parsing replaygain tags.
Anton Khirnov [Wed, 19 Feb 2014 11:10:32 +0000 (12:10 +0100)]
lavf: add an AVStream field for exporting stream-global side data
Anton Khirnov [Wed, 19 Feb 2014 11:00:03 +0000 (12:00 +0100)]
lavc: give a typedeffed name to the AVPacket.side_data struct
Michael Niedermayer [Mon, 24 Mar 2014 04:28:07 +0000 (05:28 +0100)]
Merge commit '
5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'
* commit '
5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7':
mpeg: K&R formatting cosmetics
Conflicts:
libavformat/mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 04:01:32 +0000 (05:01 +0100)]
swscale/swscale: fix integer overflow
Should fix fate failure with clang ftrapv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 03:25:44 +0000 (04:25 +0100)]
fate: add tests for linearly interpolated resampling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Mar 2014 03:00:21 +0000 (04:00 +0100)]
tests/tiny_psnr: Print information about the supported sample types in the help and error texts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 23 Mar 2014 22:05:17 +0000 (19:05 -0300)]
swresample/resample: sse float linear interpolation
About two times faster
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 23 Mar 2014 22:05:16 +0000 (19:05 -0300)]
swresample/resample: mmx2/sse2 int16 linear interpolation
About three times faster
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Krefting [Thu, 6 Feb 2014 12:51:39 +0000 (12:51 +0000)]
configure: Remove dcbzl check for e500v1 and e500v2 architectures
The DCBZL instruction is not available for the e500v1 and e500v2
architectures, but may still be recognized by the toolchain, so we
need to explicitly disable it for these architectures.
References: PowerPC™ e500 Core Family Reference Manual (Freescale)
Found-by: Ståle Kristoffersen <staalebk@ifi.uio.no>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Tanja Batchelor [Thu, 20 Mar 2014 01:02:42 +0000 (01:02 +0000)]
mpeg: K&R formatting cosmetics
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Mon, 24 Mar 2014 00:24:55 +0000 (01:24 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Split h264 slice decoding from nal decoding
Conflicts:
libavcodec/Makefile
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 23:46:20 +0000 (00:46 +0100)]
Merge commit '
e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'
* commit '
e9a77f4bc084e5174baba3a8bc869ce4d102c4f0':
h264: move macroblock decoding into its own file
Conflicts:
libavcodec/Makefile
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 23:26:46 +0000 (00:26 +0100)]
Merge commit '
ede2b451ccb1b2317858c7a32784a9b739ba45f4'
* commit '
ede2b451ccb1b2317858c7a32784a9b739ba45f4':
build: Sort h264 objects
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 23:20:56 +0000 (00:20 +0100)]
Merge commit '
fb7127b2c836b53ad5168887cd12871312c8708d'
* commit '
fb7127b2c836b53ad5168887cd12871312c8708d':
build: h264 parser depends on full h264 decoder
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 23:04:56 +0000 (00:04 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavu: add myself as dynarray.h maintainer.
ffmpeg: sub2video: send a last blank frame before closing.
tools: add dvd2concat.
lavf/concatdec: allow to match streams by id.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 19 Mar 2014 15:52:47 +0000 (16:52 +0100)]
h264: Split h264 slice decoding from nal decoding
Vittorio Giovara [Wed, 19 Mar 2014 15:47:12 +0000 (16:47 +0100)]
h264: move macroblock decoding into its own file
Luca Barbato [Fri, 28 Feb 2014 15:37:46 +0000 (15:37 +0000)]
build: Sort h264 objects
Luca Barbato [Wed, 19 Mar 2014 15:41:08 +0000 (16:41 +0100)]
build: h264 parser depends on full h264 decoder
Michael Niedermayer [Sun, 23 Mar 2014 18:43:51 +0000 (19:43 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
RELEASE_NOTES: mention new filters
Conflicts:
doc/RELEASE_NOTES
Not merged as these things where in past ffmpeg releases already.
Or at least some of them where, volunteers to checks this and update
our release notes are welcome
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 23 Mar 2014 18:17:20 +0000 (19:17 +0100)]
lavu: add myself as dynarray.h maintainer.
Nicolas George [Sun, 2 Mar 2014 19:59:32 +0000 (20:59 +0100)]
ffmpeg: sub2video: send a last blank frame before closing.
Fix trac ticket #3420.
Nicolas George [Sun, 2 Mar 2014 14:17:47 +0000 (15:17 +0100)]
tools: add dvd2concat.
Nicolas George [Wed, 26 Feb 2014 19:22:46 +0000 (20:22 +0100)]
lavf/concatdec: allow to match streams by id.
That makes the concat demuxer usable with MPEG-PS streams,
even when the streams in the different parts are detected
in different order.
Carl Eugen Hoyos [Sun, 23 Mar 2014 16:57:32 +0000 (17:57 +0100)]
Always pass the configure option sysroot to --sysroot and -isysroot.
On darwin, --sysroot may be ignored.
Carl Eugen Hoyos [Sun, 23 Mar 2014 12:24:07 +0000 (13:24 +0100)]
Autodetect VDA like all other hardware acccelerations.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Sun, 23 Mar 2014 16:28:34 +0000 (17:28 +0100)]
RELEASE_NOTES: mention new filters
Michael Niedermayer [Sun, 23 Mar 2014 14:03:50 +0000 (15:03 +0100)]
avcodec/x86/h264_qpel: Fix typo introduced by
322a1dda973e802db7b57f2007fad3efcd5bab81
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 12:25:42 +0000 (13:25 +0100)]
Move avpriv_find_pix_fmt() to utils.c
Fixes build with --disable-everything
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Fri, 21 Mar 2014 17:51:31 +0000 (18:51 +0100)]
http: restructure http_connect error handling path
The authstr memory allocations make it annoying to error in the middle
of the header setup code, so apply the usual C error handling idiom to
make it easier to error at any point.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 02:56:43 +0000 (03:56 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: drop ff_pixfmt_list_420
Conflicts:
libavcodec/flvdec.c
libavcodec/msmpeg4dec.c
libavcodec/rv10.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 02:46:16 +0000 (03:46 +0100)]
Merge commit '
d5717bc4e9cc253a933ae8130eea3a9c8bc33c0b'
* commit '
d5717bc4e9cc253a933ae8130eea3a9c8bc33c0b':
changelog: switch libx265 and compand entries
Conflicts:
Changelog
Not many changes as libx265 and compand are placed correctly for us
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 02:32:00 +0000 (03:32 +0100)]
Merge commit '
0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1'
* commit '
0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1':
configure: Always use -DOPJ_STATIC when checking for openjpeg
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 02:22:20 +0000 (03:22 +0100)]
Merge commit '
1e9db41e2a2166be5671b088ef4ad06a40af459f'
* commit '
1e9db41e2a2166be5671b088ef4ad06a40af459f':
movenc: Allow override of major brand in ftyp atom
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 17 Mar 2014 17:03:47 +0000 (18:03 +0100)]
lavc: drop ff_pixfmt_list_420
Vittorio Giovara [Fri, 21 Mar 2014 01:14:26 +0000 (02:14 +0100)]
changelog: switch libx265 and compand entries
Luca Barbato [Sat, 22 Mar 2014 19:16:44 +0000 (20:16 +0100)]
configure: Always use -DOPJ_STATIC when checking for openjpeg
Unbreaks windows systems not providing pkgconf files.
Reported-By: Rafaël Carré <funman@videolan.org>
John Stebbins [Tue, 18 Mar 2014 13:11:00 +0000 (13:11 +0000)]
movenc: Allow override of major brand in ftyp atom
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
Michael Niedermayer [Mon, 17 Mar 2014 23:08:54 +0000 (00:08 +0100)]
avcodec: Add padding after the remaining AVFrames
This limits ABI issues in case libavcodec is linked to a libavutil with larger AVFrame
Which can happen if they are shiped in seperate binary packages and libavutil is upgraded
A cleaner alternative would be to replace them by pointers but this would likely cause
a small speedloss
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 22:50:45 +0000 (23:50 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
mpegts: fix teletext pts of streams with standalone pcr pid
mpegts: add pcr filter for tracking standalone pcr pids
mpegts: factorize mpegts filter creator code
mpegts: move last_pcr to MpegTSFilter level
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 22:44:28 +0000 (23:44 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lagarith: Fix typo in printf format string
Conflicts:
libavcodec/lagarith.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 22:26:23 +0000 (23:26 +0100)]
Merge commit '
57f09608e1600d1cf1679885a46f5004d522d68f'
* commit '
57f09608e1600d1cf1679885a46f5004d522d68f':
dsputil: Move thirdpel-related bits into their own context
Conflicts:
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 22:21:54 +0000 (23:21 +0100)]
Merge commit '
82dd1026cfc1d72b04019185bea4c1c9621ace3f'
* commit '
82dd1026cfc1d72b04019185bea4c1c9621ace3f':
x86: dsputil: Move hpeldsp-related declarations to a separate header
Conflicts:
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 22:16:41 +0000 (23:16 +0100)]
Merge commit '
ae116cd3ed908d28b69d5198712217ec743d74f6'
* commit '
ae116cd3ed908d28b69d5198712217ec743d74f6':
ppc: dsputil: Move hpeldsp-related declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 22:02:46 +0000 (23:02 +0100)]
Merge commit '
6655c933a887a2d20707fff657b614aa1d86a25b'
* commit '
6655c933a887a2d20707fff657b614aa1d86a25b':
x86: dsputil: Move fpel declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 21:30:20 +0000 (22:30 +0100)]
Merge commit '
322a1dda973e802db7b57f2007fad3efcd5bab81'
* commit '
322a1dda973e802db7b57f2007fad3efcd5bab81':
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
Conflicts:
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 21:23:04 +0000 (22:23 +0100)]
Merge commit '
f9279ee74936b4990fc46287c27816ef828cc06c'
* commit '
f9279ee74936b4990fc46287c27816ef828cc06c':
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 21:17:54 +0000 (22:17 +0100)]
Merge commit '
600b854ad8173995518bd917e7f86120b5505088'
* commit '
600b854ad8173995518bd917e7f86120b5505088':
imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil
Conflicts:
libavcodec/imgconvert.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 21:11:17 +0000 (22:11 +0100)]
Merge commit '
1a8d0cf77ed2611e542ae98f341d4c43a04467bd'
* commit '
1a8d0cf77ed2611e542ae98f341d4c43a04467bd':
x86: dsputil: Move inline assembly macros to a separate header
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 20:58:04 +0000 (21:58 +0100)]
Merge commit '
1df0b061621b10edde87e3ab7ea83aed381c574f'
* commit '
1df0b061621b10edde87e3ab7ea83aed381c574f':
nuv: Reuse the DSPContext from RTJpegContext
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 20:47:38 +0000 (21:47 +0100)]
avutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 20:14:57 +0000 (21:14 +0100)]
avutil/mem: avoid using intptr_t to access void* in av_dynarray_add()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 8 Mar 2014 20:27:00 +0000 (21:27 +0100)]
lavu/mem: reimplement the dynarray functions with the macro.
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 8 Mar 2014 20:26:59 +0000 (21:26 +0100)]
lavu: add AV_DYNARRAY_ADD() macro.
Signed-off-by: Nicolas George <george@nsup.org>
Reviewed-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 17:52:21 +0000 (18:52 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: Replace arch optimization ifdefs by if cascade
Conflicts:
libavutil/float_dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Mar 2014 17:43:40 +0000 (18:43 +0100)]
Merge commit '
cc8163e1a3601a56f722a4720516e860bf1c6198'
* commit '
cc8163e1a3601a56f722a4720516e860bf1c6198':
avcodec: more correct printf specifiers
Conflicts:
libavcodec/4xm.c
libavcodec/alsdec.c
libavcodec/dfa.c
libavcodec/h264_ps.c
libavcodec/jpeg2000dec.c
libavcodec/lagarith.c
libavcodec/mpeg12dec.c
libavcodec/rv10.c
libavcodec/svq3.c
libavcodec/wmaprodec.c
libavcodec/xwddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 22 Mar 2014 17:36:33 +0000 (18:36 +0100)]
lagarith: Fix typo in printf format string
libavcodec/lagarith.c:671:16: warning: '#' flag used with ‘%u’ gnu_printf format [-Wformat]
Michael Niedermayer [Sat, 22 Mar 2014 17:21:10 +0000 (18:21 +0100)]
Merge commit '
7513234bdd93f80593bfee3eb2da8c8f0d3992da'
* commit '
7513234bdd93f80593bfee3eb2da8c8f0d3992da':
avfilter: more correct printf format specifiers
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Fri, 21 Mar 2014 04:12:22 +0000 (15:12 +1100)]
fate: add cine demux test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 17:16:21 +0000 (18:16 +0100)]
avcodec/snowenc: make snow non experimental
After this commit the created bitstream will be supported by future
decoders.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
rogerdpack [Fri, 21 Mar 2014 23:53:19 +0000 (17:53 -0600)]
udp: try to clarify verbiage on buffer_size
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
rogerdpack [Fri, 21 Mar 2014 23:37:42 +0000 (17:37 -0600)]
avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough
which can happen easily in linux
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 21 Dec 2013 15:03:59 +0000 (16:03 +0100)]
dsputil: Move thirdpel-related bits into their own context
Diego Biurrun [Wed, 29 Jan 2014 13:57:10 +0000 (14:57 +0100)]
x86: dsputil: Move hpeldsp-related declarations to a separate header
Diego Biurrun [Thu, 30 Jan 2014 00:06:28 +0000 (16:06 -0800)]
ppc: dsputil: Move hpeldsp-related declarations to a separate header
Diego Biurrun [Tue, 28 Jan 2014 17:19:21 +0000 (18:19 +0100)]
x86: dsputil: Move fpel declarations to a separate header
Diego Biurrun [Sat, 21 Dec 2013 16:33:17 +0000 (17:33 +0100)]
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros