diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-10 00:38:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-10 01:20:07 +0100 |
| commit | 8c6ebab747ca8311b81ff4d0a7c17ef60b372f32 (patch) | |
| tree | 677444f33cd2ee65df88809ca820ed57d2077ca3 /doc | |
| parent | ea4037162fb0afa871e5312a7b23c828d2b85066 (diff) | |
| parent | c57fe49da8feda7d2e6c266978250a15a83e0484 (diff) | |
| download | ffmpeg-8c6ebab747ca8311b81ff4d0a7c17ef60b372f32.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (26 commits)
eac3dec: replace undefined 1<<31 with INT32_MIN in noise generation
yadif: specify array size outside DECLARE_ALIGNED
prores: specify array size outside DECLARE_ALIGNED brackets.
WavPack demuxer: set packet duration
tta: use skip_bits_long()
mxfdec: Ignore the last entry in Avid's index table segments
mxfdec: Sanity-check SampleRate
mxfdec: Handle small EditUnitByteCount
mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a
mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows
mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()
mxfdec: Sanity check PreviousPartition
mxfdec: Never seek back in local sets and KLVs
mxfdec: Move the current_partition check inside mxf_read_header()
mxfdec: Fix infinite loop in mxf_packet_timestamps()
mxfdec: Check eof_reached in mxf_read_local_tags()
mxfdec: Check for NULL component
mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
mxfdec: Make sure x < index_table->nb_ptses
build: Add missing directories to DIRS declarations.
...
Conflicts:
doc/build_system.txt
doc/fate.texi
libavfilter/x86/yadif_template.c
libavformat/mxfdec.c
libavutil/Makefile
tests/fate/audio.mak
tests/fate/prores.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/ref/fate/bethsoft-vid
tests/ref/fate/cscd
tests/ref/fate/dfa4
tests/ref/fate/nuv
tests/ref/fate/vp8-sign-bias
tests/ref/fate/wmv8-drm
tests/ref/lavf/gxf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/fate.texi | 2 | ||||
| -rw-r--r-- | doc/ffserver.conf | 2 | ||||
| -rw-r--r-- | doc/filters.texi | 1 | ||||
| -rw-r--r-- | doc/swscale.txt | 1 | ||||
| -rw-r--r-- | doc/viterbi.txt | 1 |
5 files changed, 1 insertions, 6 deletions
diff --git a/doc/fate.texi b/doc/fate.texi index acb4bfe6a1..1612bdf1e0 100644 --- a/doc/fate.texi +++ b/doc/fate.texi @@ -171,4 +171,4 @@ the synchronisation of the samples directory. Example: @example make V=1 SAMPLES=/var/fate/samples THREADS=2 fate -@end example +@end example
\ No newline at end of file diff --git a/doc/ffserver.conf b/doc/ffserver.conf index 217117005c..d10ac5bc09 100644 --- a/doc/ffserver.conf +++ b/doc/ffserver.conf @@ -373,5 +373,3 @@ ACL allow 192.168.0.0 192.168.255.255 <Redirect index.html> URL http://www.ffmpeg.org/ </Redirect> - - diff --git a/doc/filters.texi b/doc/filters.texi index 938a5e1704..12b551cf2e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3365,4 +3365,3 @@ mainly useful as a template and to be employed in analysis / debugging tools. @c man end VIDEO SINKS - diff --git a/doc/swscale.txt b/doc/swscale.txt index 4c62e67321..0dc4b8a5af 100644 --- a/doc/swscale.txt +++ b/doc/swscale.txt @@ -96,4 +96,3 @@ would benefit from it. Also, as already hinted at, initFilter() accepts an optional convolutional filter as input that can be used for contrast, saturation, blur, sharpening shift, chroma vs. luma shift, ... - diff --git a/doc/viterbi.txt b/doc/viterbi.txt index d9d924f621..5362a0b765 100644 --- a/doc/viterbi.txt +++ b/doc/viterbi.txt @@ -107,4 +107,3 @@ one with score 3) Author: Michael niedermayer Copyright LGPL - |