Michael Niedermayer
4be0b91094
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: step to next frame if paused when seeking
ffplay: move up pause functions
ffplay: remember last window dimensions
ffplay: fix order of setting show_mode
ffplay: dynamically allocate audio buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 16:14:21 +01:00
Stefano Sabatini
6d9c21dc0e
doc/indevs: add missing final dot in v4l2 option value description
...
Fix inconsistency.
2013-02-02 15:32:34 +01:00
Stefano Sabatini
fd6b6efbd2
lavfi/crop: fix help message for the keep_aspect option
2013-02-02 15:32:34 +01:00
Stefano Sabatini
6032a1c977
ffplay: extend doxy for audio_decode_frame()
2013-02-02 15:32:34 +01:00
Nicolas George
55910e1894
lavd/alsa: simplify reordering functions definition.
2013-02-02 14:13:11 +01:00
Michael Niedermayer
6726fb6533
avfilter/vf_hqdn3d.h: restore author attribution, history and project name
...
See git blame of pre split avfilter/vf_hqdn3d.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 13:18:10 +01:00
Michael Niedermayer
d593f2b241
avfilter/x86/vf_hqdn3d_init: fix author attribution & project name
...
Reference: 7a1944b907
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 13:18:09 +01:00
Michael Niedermayer
0d13a7b786
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_hqdn3d: x86: Add proper arch optimization initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 13:18:01 +01:00
Marton Balint
4ea7fbb2ec
ffplay: step to next frame if paused when seeking
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-02 12:38:15 +01:00
Marton Balint
c5eab4bb70
ffplay: move up pause functions
...
No change in functionality.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-02 12:38:14 +01:00
Marton Balint
5de3f724f1
ffplay: remember last window dimensions
...
After this change the dimensions of single image videos will be remembered when
coming back from full screen. The issue was mentioned in ticket #2174 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-02 12:38:14 +01:00
Marton Balint
4fd6e5af1e
ffplay: fix order of setting show_mode
...
Without the fix the refresh event may have got called with unset show mode.
Fixes ticket #2174 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-02 12:38:14 +01:00
Marton Balint
571ef42dd4
ffplay: dynamically allocate audio buffer
...
We simply remove the fixed length VideoState->audio_buf2 and use
the previously unused VideoState->audio_buf1.
Fixes ticket #2191 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-02-02 12:38:14 +01:00
Carl Eugen Hoyos
b45a3e167f
Map the interlaced flag of yuv4mpeg streams to AVCodecContext->field_order.
...
Fixes a part of ticket #2190 .
2013-02-02 12:32:04 +01:00
Steven Boswell II
6289a8296a
build-sys: Fix pkgconfig files when ffmpeg is built with --build-suffix
...
Tested-on: Fedora Core 14, 16, and 17.
Tested-on: Ubuntu by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 03:24:16 +01:00
Carl Eugen Hoyos
985e93a865
Do not fail for mixed interlaced / non-interlaced YUV4MPEG streams.
2013-02-02 00:01:48 +01:00
Ronald S. Bultje
8af915c21b
vp56: remove clear_blocks call, and clear alpha plane U/V DC only.
...
The non-alpha and alpha-Y planes are cleared in the idct_put/add()
calls. For the alpha U/V planes, we only care about the DC for entropy
context prediction purposes, the rest of the data is unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 23:51:34 +01:00
Carl Eugen Hoyos
6a50e8a190
Do not change codec in flv streams if the user has forced a codec.
...
Fixes ticket #2218 .
2013-02-01 23:27:15 +01:00
Matthieu Bouron
5a67e30b1c
ffmpeg: fix broken channel_layout option
...
Fixes ticket #2163 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 22:54:18 +01:00
Stefano Sabatini
423856c4ae
doc/filters: fix syntax and typo for the afade curve option
2013-02-01 18:52:42 +01:00
Stefano Sabatini
986540b65f
doc/filters: create a dedicated examples section for lut*, and itemize
2013-02-01 18:35:15 +01:00
Stefano Sabatini
902fa77fd7
doc/filters: fix syntax and description for the lut* options
2013-02-01 18:32:21 +01:00
Stefano Sabatini
b868275ddb
doc/muxers: fix level for the segment options subsection
...
Properly declare it like a @subsection, rather than as a @section.
2013-02-01 18:14:05 +01:00
Carl Eugen Hoyos
99eedfc400
doc/muxers.texi: Fix mp3 picture attachment documentation.
2013-02-01 17:54:48 +01:00
Michael Niedermayer
911e270688
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Use proper "" quotes for local header #includes
ppc: fmtconvert: Drop two unused variables.
bink demuxer: set framerate.
Conflicts:
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 14:34:18 +01:00
Michael Niedermayer
1bc51a7a74
Merge commit '1730ca2eca42974af0c29f38a0770997cba2f0da'
...
* commit '1730ca2eca42974af0c29f38a0770997cba2f0da':
bink demuxer: check malloc return value
See:
commit e400b95b32
Author: Paul B Mahol <onemda@gmail.com>
Date: Sat Jun 9 10:57:14 2012 +0000
bink: check av_mallocz() return value
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 14:26:44 +01:00
Michael Niedermayer
69a6eddd60
Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'
...
* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a':
bink: fix a check for the first frame.
doc/developer: Drop obsolete MPlayer reference
doc/developer: Add ISC license to list of acceptable licenses
doc/developer: Add web links for all suggested licenses
Conflicts:
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 14:15:30 +01:00
Diego Biurrun
76d90125cd
vf_hqdn3d: x86: Add proper arch optimization initialization
2013-02-01 13:11:45 +01:00
Diego Biurrun
6c1a7d07eb
Use proper "" quotes for local header #includes
2013-02-01 12:51:15 +01:00
Diego Biurrun
4eef2ed707
ppc: fmtconvert: Drop two unused variables.
2013-02-01 12:51:13 +01:00
Anton Khirnov
9ec8971060
bink demuxer: set framerate.
2013-02-01 12:42:17 +01:00
Anton Khirnov
1730ca2eca
bink demuxer: check malloc return value
2013-02-01 12:41:38 +01:00
Anton Khirnov
f2960097e4
bink: fix a check for the first frame.
...
Packet pts is a very unreliable indicator, use
AVCodecContext.frame_number instead.
2013-02-01 12:41:31 +01:00
Diego Biurrun
8787847dc6
doc/developer: Drop obsolete MPlayer reference
2013-02-01 11:17:24 +01:00
Diego Biurrun
8b0fda180e
doc/developer: Add ISC license to list of acceptable licenses
2013-02-01 11:17:21 +01:00
Diego Biurrun
cb30bf7f03
doc/developer: Add web links for all suggested licenses
2013-02-01 11:16:55 +01:00
Michael Niedermayer
086566a557
dict: fix memleak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 03:56:51 +01:00
Michael Niedermayer
ffd02d0c19
Merge remote-tracking branch 'mjbshaw/master'
...
* mjbshaw/master:
libopenjpegenc: simplify switch statement
libopenjpegenc: add support for pix fmt gbrp (8-16 bit)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 02:33:42 +01:00
Allan Kristensen
4789c25d83
matroska: fixed missing S_DVBSUB subtitles
2013-02-01 01:49:04 +01:00
Sebastian Sandberg
c6779c5131
vc1dec: fieldtx is only valid for interlaced frames
...
the fieldtx_plane is not cleared for interlaced fields
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 00:48:05 +01:00
Michael Bradshaw
28f36dce3e
libopenjpegenc: simplify switch statement
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
2013-01-31 16:03:58 -07:00
Michael Bradshaw
c58c67398d
libopenjpegenc: add support for pix fmt gbrp (8-16 bit)
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
2013-01-31 15:55:00 -07:00
Michael Niedermayer
131fac1c12
vc1dec: fix block_off
...
Fixes corruption of motion_val
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 23:22:11 +01:00
Stefano Sabatini
b999774f0b
doc/indevs: document v4l2 options
...
Reviewed-By: Giorgio Vazzana <mywing81@gmail.com>
2013-01-31 22:13:08 +01:00
Stefano Sabatini
349e7f423f
doc/indevs: itemize examples for the v4l2 device
2013-01-31 22:13:08 +01:00
Nicolas George
d2ccab5f8a
lavfi/buffersrc: forward filter_frame errors.
...
Note: The ret variable was unused.
2013-01-31 21:03:54 +01:00
Nicolas George
dcce43340f
lavfi/af_amerge: set outbuf->audio->channels.
...
The value is lost because of avfilter_copy_buffer_ref_props().
Fix trac ticket #2217 .
2013-01-31 21:03:54 +01:00
Nicolas George
ae14887ee7
lavfi/af_amerge: check for buffer queue overflows.
...
Without that test, ff_bufqueue_add silently discards the
oldest buffer, that leaves in[i].nb_samples inconsistent,
and causes later a segfault.
2013-01-31 21:03:54 +01:00
Nicolas George
6560625f0a
lavfi/bufferqueue: add ff_bufqueue_is_full().
2013-01-31 21:03:54 +01:00
Michael Niedermayer
dd87d4a318
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
configure: Add a comment indicating why uclibc is checked before glibc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-31 20:03:36 +01:00