2497914a18
avformat/img2dec: pass error code and signal EOF
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-25 16:20:23 +02:00
1dbdcb4a8c
avformat/img2dec: fix error code at EOF for pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-25 15:22:42 +02:00
454f98b881
Merge commit '4620affa24eedb167482198aa04126bcedd05620'
...
* commit '4620affa24eedb167482198aa04126bcedd05620':
m4vdec: K&R formatting cosmetics
Conflicts:
libavformat/m4vdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-25 14:02:55 +02:00
59f4966756
Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'
...
* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
lmlm4: K&R formatting cosmetics
Conflicts:
libavformat/lmlm4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-25 13:51:43 +02:00
8f3d3e5f83
Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'
...
* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
concat: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-25 13:45:30 +02:00
9b53691f73
Merge commit '28f5cd312c9da9072108edf8b7685d009374ea96'
...
* commit '28f5cd312c9da9072108edf8b7685d009374ea96':
fate: Switch ra4-288 test from framecrc() to pcm()
Conflicts:
tests/fate/real.mak
The test is kept disabled as it still does not pass on x86-64 due to float
rounding
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-25 13:37:40 +02:00
a6fd685fed
Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'
...
* commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d':
avcodec: Fix a doxy comment to refer to the right function
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-25 12:09:32 +02:00
4620affa24
m4vdec: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2014-09-25 01:58:51 -07:00
86a361081d
lmlm4: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2014-09-25 01:44:32 -07:00
95d312d6c8
concat: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2014-09-25 01:44:31 -07:00
28f5cd312c
fate: Switch ra4-288 test from framecrc() to pcm()
...
The decoder is float-based and the test needs to allow for some fuzz.
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2014-09-25 01:44:31 -07:00
d07ddc93e2
avcodec: Fix a doxy comment to refer to the right function
...
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st >
2014-09-25 10:01:25 +03:00
303fc9b368
avcodec/mpegvideo_enc: write a log message at verbose level if frame re-encoding occurs due to VBV
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-25 05:28:32 +02:00
4f4f08e6f0
x86/idctdsp: port {put,add}_pixels_clamped to yasm
...
Also add sse2 versions for both.
put_pixels_clamped port and sse2 version originally written by Timothy Gu.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: James Almer <jamrial@gmail.com >
2014-09-24 21:52:13 -03:00
c99a882814
avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: James Almer <jamrial@gmail.com >
2014-09-24 21:43:19 -03:00
6441d522e9
Merge commit '2f172f1ae984b763c06069adb51d0053b3834f4b'
...
* commit '2f172f1ae984b763c06069adb51d0053b3834f4b':
rtsp: Clear the session id on redirects
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-25 01:08:44 +02:00
d8ddac363e
Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'
...
* commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc':
rtpenc: HEVC/H.265 support
Conflicts:
Changelog
libavformat/rtpenc.c
libavformat/rtpenc_hevc.c
libavformat/version.h
See: 6821a5a4admichaelni@gmx.at >
2014-09-25 00:17:36 +02:00
b8d3f7fc21
Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'
...
* commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95':
libavformat: Move avc mp4 startcode parsing to a shared file
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-25 00:09:42 +02:00
ad26e83f9c
avcodec/x86: use function pointers for {put,add}_pixels_clamped
...
Same behavior as in simple_idct.
This way the best optimized versions available will be used instead.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: James Almer <jamrial@gmail.com >
2014-09-24 18:52:32 -03:00
857fc0a71f
libavutil/opt: fix av_opt_set_channel_layout() to access correct memory address
...
Signed-off-by: Philip DeCamp <decamp@mit.edu >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 22:57:40 +02:00
2f172f1ae9
rtsp: Clear the session id on redirects
...
This fixes handling redirects in case the server provided a session
id within the redirect reply.
Signed-off-by: Martin Storsjö <martin@martin.st >
2014-09-24 23:34:02 +03:00
ddf5fb71ee
rtpenc: HEVC/H.265 support
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2014-09-24 23:33:26 +03:00
a2efbecc4e
libavformat: Move avc mp4 startcode parsing to a shared file
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2014-09-24 23:33:17 +03:00
70277d1d23
x86/videodsp: add ff_emu_edge_{hfix,hvar}_avx2
...
~15% faster than sse2.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2014-09-24 16:12:55 -03:00
280ef183db
libavformat/ffmetadec: Make unchanged function arguments const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 19:17:55 +02:00
ab6f4fd4a7
libavformat/dv: Make unchanged function arguments const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 19:11:05 +02:00
af19d2ed1e
libavformat/avienc: Make unchanged function arguments const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 18:34:21 +02:00
d6ed67780b
libavformat/avidec: Make unchanged function arguments const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 18:33:55 +02:00
e27f781aeb
Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'
...
* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
rtpdec_hevc: Drop a duplicated, nonstandard entry
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 17:25:34 +02:00
3cd252d29a
doc/APIchanges: fix typo
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 17:14:56 +02:00
ac682955e9
postproc: add basic deblock filter visualization support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 16:58:47 +02:00
266b3d4fe4
ffplay: use av_codec_get_pkt_timebase()
...
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr >
Reviewed-by: Marton Balint <cus@passwd.hu >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 13:44:56 +02:00
c463dfc7e4
rtpdec_hevc: Drop a duplicated, nonstandard entry
...
The RFC spec draft only specifies the "H265" name - there is no
specification saying how to interpret "HEVC" (if such a packet
format is specified it could be an entirely different format).
Since this is a very new standard (still a draft), there is little
need for compatibility with existing, broken implementations. Therefore
remove the extra alias, to avoid the risk of encouraging incorrect
usage.
Intentionally keeping the ff_hevc_dynamic_handler name for the
handler, to use "hevc" consistently as name for the codec instead
of "h265" within the library internals as long as there only is one
single variant in actual use.
Signed-off-by: Martin Storsjö <martin@martin.st >
2014-09-24 10:44:14 +03:00
170e2fd7c3
configure: Check if "-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600" is needed for localtime_r()
...
Fixes build with musl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 05:04:24 +02:00
3bc036171f
configure: fail if SDL is unavailable and --enable-sdl is specified
...
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 02:32:56 +02:00
fb01a18462
configure: reindent the --disable-sdl related code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 02:32:52 +02:00
a7ed01082f
configure: support --disable-sdl
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 02:32:49 +02:00
3fe962940f
hevc: move intermediate bidir buffer
...
Other buffers are already there.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 01:26:12 +02:00
de60ce391d
hevc: remove unneeded buffer.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 01:26:12 +02:00
164d6c7f5b
x86/videodsp: fix warning about discarded 'const' qualifier
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: James Almer <jamrial@gmail.com >
2014-09-23 19:59:20 -03:00
789274dca8
avcodec/libvpxdec: don't check for formats other than i420 when vp9 decoding is disabled
...
Should fix ticket #3958 .
Reviewed-by: James Zern <jzern@google.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2014-09-23 19:50:28 -03:00
00d3bb1a07
tests/fate-run.sh: Cat .err file in case of error with V>0
...
This may make fate failures where only the console output is available
easier to analyze
Suggested-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-24 00:35:38 +02:00
9f0ba52f34
Skip decklink_common_c.h when running make checkheaders.
2014-09-23 22:51:36 +02:00
55179987e7
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: move pts calculating code to generic decoder
ffplay: factorize decoder functions to generic decoder
ffplay: handle fullscreen status on resize event
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-23 22:09:54 +02:00
6b733be755
Fix compile error on arm4/arm5 platform
...
Since these commits
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8
compilation on arm4/arm5 fails:
libavcodec/libavcodec.so: undefined reference to
`ff_startcode_find_candidate_armv6'
Because libavcodec/arm/Makefile contains
ARMV6-OBJS-$(CONFIG_STARTCODE) += arm/startcode_armv6.o
function ff_startcode_find_candidate_armv6 is not included for older ARM
archs. The bug was found during automatic buildroot builds:
http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f//build-end.log
Quote from configure summary:
ARCH arm (armv4t)
big-endian no
runtime cpu detection yes
ARMv5TE enabled no
ARMv6 enabled no
ARMv6T2 enabled no
http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/build-end.log
ARCH arm (armv5te)
big-endian no
runtime cpu detection yes
ARMv5TE enabled yes
ARMv6 enabled no
ARMv6T2 enabled no
This patch provides the necessary #if clauses as discussed with Michael:
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-September/163329.html
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-23 21:11:05 +02:00
1f5a3cf688
ffplay: move pts calculating code to generic decoder
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2014-09-23 21:08:40 +02:00
9e0d1c00b5
ffplay: factorize decoder functions to generic decoder
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2014-09-23 21:08:40 +02:00
32f1a288e2
ffplay: handle fullscreen status on resize event
...
In some cases resize events can happen even during fullscreen, so let's pass
the proper flag to SDL_SetVideoMode.
Fixes ticket #3964 .
Reported-by: Jeff Dwork <jeff@reggie.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2014-09-23 21:08:35 +02:00
6843b9dc78
avformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header()
...
Fixes Ticket1304
Commit message and extradata size bugfix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-23 18:24:40 +02:00
e5b3112996
avcodec/webp: fix default palette color 0xff000000 -> 0x00000000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-23 17:15:20 +02:00
