Michael Niedermayer
149c1a26c4
Merge commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445'
...
* commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445':
tiff: Replace deprecated PIX_FMT names by modern ones
Conflicts:
libavcodec/tiff.c
See: ac627b3d38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 18:38:17 +02:00
Michael Niedermayer
b7f8d3de2c
Merge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'
...
* commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300':
dv: Update DV-profile-related functions to current public API
Conflicts:
libavcodec/dvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 18:29:38 +02:00
Michael Niedermayer
6cdf409884
avformat/mpegtsenc: do not flush after everything
...
there is flushing code in the avformat core that does this in a more
controlled way.
Fixes ticket2748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 18:10:04 +02:00
Michael Niedermayer
fee982048e
avformat/mux: flush after header writing, like after packets
...
This makes problematic unconditional flushes in mpegts redundant
And is thus part of a fix for ticket 2748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 18:10:04 +02:00
Michael Niedermayer
b4d525eb63
avcodec/pnm: check buf[0] before using buf[1]
...
Fixes CSA warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 14:01:03 +02:00
Diego Biurrun
9f17685dfb
avcodec: Deprecate unused defines and options
2014-08-03 03:24:16 -07:00
Diego Biurrun
bad81800bb
avcodec: options: Add missing deprecation ifdefs around emu_edge
2014-08-03 03:24:15 -07:00
Diego Biurrun
072916d903
filtfmts: Replace deprecated uses of AVFilterPad
...
Also add missing mem.h header for av_freep().
2014-08-03 03:23:51 -07:00
Michael Niedermayer
4fed019821
avcodec/takdec: remove unused variable
...
Found-by: CSA
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 11:35:25 +02:00
Michael Niedermayer
7dbc27dc1d
avcodec/takdec: move tmp declaration to where its used
...
Makes the code a bit easier to read
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 11:34:51 +02:00
Stefano Sabatini
ac1e3882cc
doc/ffserver: merge paragraph starting with "What happens next?" with previous one
...
The name of the paragraph sounded a bit silly, and its text is small so
it's better to merge it with the previous paragraph.
2014-08-03 11:27:27 +02:00
Diego Biurrun
6a928293dd
examples: filter_audio: Add missing mem.h header for av_freep()
2014-08-03 01:29:43 -07:00
Diego Biurrun
c6a1ac2dd9
vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame
2014-08-03 01:29:43 -07:00
Diego Biurrun
c697c590fb
lcl: Disentangle pointers to input data and decompression buffer
...
This is cleaner and avoids a cast plus a related const qualifier warning.
2014-08-03 01:29:43 -07:00
James Almer
d0f56ca071
x86/hevc_deblock: improve 8bit transpose store macros
...
Up to four instructions less depending on function and instruction set.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 04:24:15 +02:00
Michael Niedermayer
2e6fdcb7f3
avformat/tee: flip assigment direction
...
Found-by: CSA
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 03:18:52 +02:00
Clément Bœsch
ee7ee9b1b4
avcodec/mpeg12dec: fix vissible typo after 17c65651
2014-08-03 00:02:23 +02:00
Michael Niedermayer
17c6565186
avcodec/mpeg12dec: Document Ticket3809 fix
...
Suggested-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 23:10:23 +02:00
Michael Niedermayer
c103c48525
avcodec/error_resilience: make error an local variable where possible
...
This makes the code easier to understand as the scope of the variable is
smaller.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 22:04:08 +02:00
Michael Niedermayer
459996325d
avcodec/error_resilience: comment out unused assignment
...
Its not removed as the code which uses this is out-commented too.
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 22:01:59 +02:00
Diego Biurrun
df507d5aa0
tiff: Replace deprecated PIX_FMT names by modern ones
2014-08-02 12:54:37 -07:00
Diego Biurrun
7835c24e19
dv: Update DV-profile-related functions to current public API
2014-08-02 12:54:37 -07:00
Michael Niedermayer
d73371b58c
avcodec/mmvideo: remove unused return value and assignment
...
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 21:46:24 +02:00
Michael Niedermayer
08b6591cf6
avcodec/avuienc: move pointer declaration to where its used
...
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 20:13:08 +02:00
Michael Niedermayer
17fef17f67
avfilter/lavfutils: remove redundant variable init
...
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 20:03:10 +02:00
Michael Niedermayer
146e498c9e
Merge commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8'
...
* commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8':
ppc: fft: Build AltiVec optimizations in the standard way
Conflicts:
libavcodec/ppc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 19:40:18 +02:00
Michael Niedermayer
1d8d21b90a
ffserver: initialize pbuffer in prepare_sdp_description()
...
also check pbuffer before use
Found-by: CSA
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 18:32:37 +02:00
Michael Niedermayer
e706fe7640
avcodec/wavpackenc: Fix log2sample() result value
...
Found-by: CSA
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 18:15:12 +02:00
Michael Niedermayer
2b501b553f
avformat/dtsdec: skip the first 4k in dts_probe()
...
DTS primarly needs to be separated from PCM, and PCM can contain cliping and
overshoots at the very start which can mimic DTS headers.
If this isnt sufficient then more of the DTS stream has to be decoded
and analyzed
Fixes ticket3784
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 17:25:04 +02:00
Michael Niedermayer
e6fabd6e9b
avformat/dtsdec: fix signedness in reference pcm highpass in dts_probe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 17:24:42 +02:00
Michael Niedermayer
dd551dc7ff
avformat/dtsdec: count LE and BE separately in dts_probe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 17:21:03 +02:00
Diego Biurrun
ffa4d4ef0b
ppc: fft: Build AltiVec optimizations in the standard way
2014-08-02 07:40:37 -07:00
Matthew Oliver
66627075d9
msvc: fix implicitly declared read/close.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 14:52:17 +02:00
Michael Niedermayer
3fa9692ae2
avcodec/hevc: move HEVCLocalContext declaration into loop
...
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 05:15:57 +02:00
Michael Niedermayer
92be540636
avcodec/h264_parser: remove redundant assignment
...
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 05:14:18 +02:00
Michael Niedermayer
e85bc9df87
Merge commit 'f0e959481968b6d906931127237ed981b6414f6e'
...
* commit 'f0e959481968b6d906931127237ed981b6414f6e':
af_channelmap: Set the frame channel layout
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 04:47:31 +02:00
Michael Niedermayer
dcd984e24d
Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'
...
* commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e':
af_join: Set the output frame format
See: e0dd8cadcc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 04:45:26 +02:00
Michael Niedermayer
98e42a249e
avformat/format: Check for av_guess_format() failure
...
Fixes null pointer dereference
Fixes Ticket3812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 04:16:02 +02:00
Michael Niedermayer
26ffa8eaee
avformat/format: use av_match_name() in av_guess_codec()
...
Fixes part of Ticket2236
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 03:39:38 +02:00
Michael Niedermayer
956f4087c6
ffmpeg_opt: Use av_guess_codec() instead of AVOutputFormat->*codec
...
Fixes part of ticket2236
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 03:29:42 +02:00
Michael Niedermayer
bcc898dd26
avcodec/dvdsub_parser: print message if packet is smaller than the packet size field
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 01:17:24 +02:00
Michael Niedermayer
81c1657a59
avcodec/dvdsub_parser: Check buf_size before reading 32bit packet size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 01:15:37 +02:00
Luca Barbato
f0e9594819
af_channelmap: Set the frame channel layout
...
Otherwise the frame would show the first layout matching the
channel count.
2014-08-02 00:58:21 +02:00
Luca Barbato
87efaa97ce
af_join: Set the output frame format
2014-08-02 00:58:21 +02:00
Michael Niedermayer
cfdb30d2f1
avcodec/dvdsub_parser: never return 0 when the input isnt 0
...
Fixes a infinite loop
Fixes Ticket3804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 00:27:23 +02:00
Michael Niedermayer
afd62b3f18
Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'
...
* commit 'fa14804c83a7108a50c63d1f2180e30c75909529':
flv: Index the audio stream
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01 21:34:31 +02:00
Michael Niedermayer
f95298c913
avcodec/mpeg12dec: fix support for interlaced mpeg2 with missing last slice
...
Fixes Ticket3809
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01 21:10:43 +02:00
Michael Niedermayer
7f852962dc
avcodec/mpeg12dec: print the amount of overread
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01 21:06:13 +02:00
Benoit Fouet
f9bd6d61bc
h264_mp4toannexb_bsf: rename first_idr to new_idr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01 17:58:30 +02:00
Michael Niedermayer
293124cae8
Merge commit '7ab551f9fd9a63586649a7df8790ddaeac55420f'
...
* commit '7ab551f9fd9a63586649a7df8790ddaeac55420f':
h264: prevent theoretical infinite loop in SEI parsing
Conflicts:
libavcodec/h264_sei.c
Not merged, as this would remove 2 bitstream compliance checks.
The specification does not allow the bitstream to end in the middle
of these variable length elements and we have no samples which
have such non compliant truncation either so its better to error
out. Which is simpler as well
This issue also has been fixed long ago
See: 9decfc17bb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01 17:47:15 +02:00