generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
47,894 Commits 24 Branches 241 Tags 173 MiB
1081d78746
Commit Graph

11883 Commits

Author SHA1 Message Date
Paul B Mahol
9a31997938 BRSTM demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-29 19:04:35 +00:00
Diego Biurrun
cc7d5cfeec img2: K&R formatting cosmetics 
Also introduce local img_ namespace to simplify debugging.
 2012-11-29 17:15:57 +01:00
Michael Niedermayer
9f8e2e92ae Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd' 
* commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd':
  fate: h264: Add dependencies
  fate: ea: Add dependencies
  fate: Do not unconditionally run libavutil tests
  rtpenc_chain: Remove unused variable
  nuv: check for malloc failure when allocating extradata
  nuv: use the stream indices generated by avformat_new_stream()

Conflicts:
	tests/fate/ea.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 14:16:46 +01:00
Michael Niedermayer
52066bdb30 Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b' 
* commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b':
  nuv: cosmetics: pretty-printing

Conflicts:
	libavformat/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 14:07:51 +01:00
Michael Niedermayer
d7b20bfbb5 Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66' 
* commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66':
  lavf: move nuv fourcc audio tags from riff to nuv
  lavf: add a common function for selecting a pcm codec from parameters

Conflicts:
	libavformat/internal.h
	libavformat/mov.c
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 14:00:44 +01:00
Michael Niedermayer
076300bf8b Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 
* commit 'bfe5454cd238b16e7977085f880205229103eccb':
  lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
  lavf: move "MP3 " fourcc from riff to nut
  fate: vpx: Add dependencies
  fate: Fix wavpack-matroskamode test dependencies
  x86: dsputilenc: port to cpuflags

Conflicts:
	libavformat/internal.h
	libavformat/nut.c
	tests/fate/vpx.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 13:45:57 +01:00
Daniel Verkamp
a0958949eb Vivo demuxer 2012-11-28 20:13:05 +00:00
Diego Biurrun
2c4593dd13 rtpenc_chain: Remove unused variable 2012-11-28 18:17:49 +01:00
Justin Ruggles
c74f81786d nuv: cosmetics: pretty-printing 2012-11-28 11:18:50 -05:00
Justin Ruggles
5c7bf2ddde lavf: move nuv fourcc audio tags from riff to nuv 2012-11-28 11:18:50 -05:00
Justin Ruggles
ab87d9b667 nuv: check for malloc failure when allocating extradata 
Also make sure extradata is freed in the case where multiple
NUV_EXTRADATA frame types are found. This may not happen in practice,
but it could happen in a malformed stream, which would lead to a memleak
if not handled.
 2012-11-28 11:18:50 -05:00
Justin Ruggles
261e9348ef lavf: add a common function for selecting a pcm codec from parameters 2012-11-28 11:18:50 -05:00
Justin Ruggles
838ed296df nuv: use the stream indices generated by avformat_new_stream() 2012-11-28 11:18:50 -05:00
Justin Ruggles
bfe5454cd2 lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h 2012-11-28 11:18:49 -05:00
Justin Ruggles
cdaa1f84fb lavf: move "MP3 " fourcc from riff to nut 
Original commit, 7b24f9b, says it was added because it is used in libnut.
 2012-11-28 11:18:49 -05:00
Paul B Mahol
01eed8c607 iff demuxer: 16SV support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 15:55:14 +00:00
Paul B Mahol
23101ceaa2 avrdec: implement seeking 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 13:03:48 +00:00
Paul B Mahol
b0d9b011c7 avrdec: sample rate takes 3 bytes not 4 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 11:02:22 +00:00
Paul B Mahol
1793128cf7 avrdec: fix typo in .long_name 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 10:56:59 +00:00
Michael Niedermayer
2754dbb6e1 nut: put nut PCM audio tags in front of avi tags. 
This fixes correctly storing and identifying PCM in nut.

Based on patch by Luca Barbato
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 02:03:56 +01:00
Michael Niedermayer
577b39aea2 Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8' 
* commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8':
  h264: check ref_count validity for num_ref_idx_active_override_flag
  h264: add missing new line to log message
  dcadec: skip QMF on unused channels
  wavenc: write fact chunk sample count at the correct file position
  riff: do not add empty metadata tags in INFO chunk

Conflicts:
	libavcodec/dcadec.c
	libavcodec/h264.c
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 14:31:04 +01:00
Michael Niedermayer
b4d4e51027 Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9' 
* commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9':
  riff: only warn on a bad INFO chunk code size instead of failing
  configure: Add separate list for libraries and use where appropriate
  x86: float_dsp: add SSE version of vector_fmul_scalar()

Conflicts:
	configure
	libavformat/riff.c
	libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 14:10:05 +01:00
Michael Niedermayer
257196209f file: fix 10l error in access() check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 13:24:00 +01:00
Paul B Mahol
51d6879939 AFC demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-27 10:17:28 +00:00
Paul B Mahol
10c8f91341 astdec: improve probing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-27 10:16:30 +00:00
Michael Niedermayer
8aa6d899c0 cafdec: fix seeking with adpcm 
Fixes Ticket1906

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 05:03:24 +01:00
Michael Niedermayer
16ef48c37f file: Fallback to stat() based file_check() when access() or its named flags are unavailable. 
Should fix compilation on native windows
We could also use _access() and literal numbers as flags but i cant test it
and the compilation failure should be fixed ASAP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 05:03:24 +01:00
Michael Niedermayer
407921072f file: fix file_check() 
Fixes Ticket1904

This should work on windows, but if not please contact me ASAP
i have another idea on how to solve this without access() if that
really doesnt work on windows.

Strongly based on patch by divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 03:53:53 +01:00
Michael Niedermayer
2fe0094e0b wavenc: write fact chunk sample count at the correct file position 
Fixes curruption of metadata in the INFO chunk.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-11-26 19:11:10 -05:00
Justin Ruggles
3c370f5abc riff: only warn on a bad INFO chunk code size instead of failing 
fixes Bug 392
 2012-11-26 19:08:51 -05:00
Justin Ruggles
259d8c5647 riff: do not add empty metadata tags in INFO chunk 2012-11-26 19:08:51 -05:00
Michael Niedermayer
386fc67c79 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: avoid integer overflow in ff_compute_frame_duration()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 16:24:23 +01:00
Peter Ross
76f60788e7 iff demuxer: don't bother checking bitmap compression type; iff decoder does this now 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 23:29:02 +11:00
Janne Grunau
7709ce029a lavf: avoid integer overflow in ff_compute_frame_duration() 
Scaling the denominator instead of the numerator if it is too large
loses precision. Fixes an assert caused by a negative frame duration in
the fuzzed sample nasa-8s2.ts_s202310.

CC: libav-stable@libav.org
 2012-11-26 10:26:08 +01:00
Michael Niedermayer
bf2f93cdbf Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc' 
* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
  x86: h264_chromamc: port to cpuflags
  yop: fix typo
  avconv: fix copying per-stream metadata.
  doc: avtools-common-opts: Fix terminology concerning metric prefixes
  configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
  riff: Make ff_riff_tags static and move under appropriate #ifdef

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 00:43:45 +01:00
Paul B Mahol
b491da18d1 yop: fix typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-11-25 11:10:52 -05:00
Diego Biurrun
ddb009425c riff: Make ff_riff_tags static and move under appropriate #ifdef 
The table is not used outside the file.
 2012-11-25 13:32:10 +01:00
Michael Niedermayer
e6305f7631 mov: set flags to indicate that byte wise seeking is not supported. 
Fixes Ticket1831

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 01:19:33 +01:00
Nicolas George
ca4872e887 lavf/sbgdec: use proper constants for av_log(). 2012-11-24 23:56:52 +01:00
Carl Eugen Hoyos
d080292651 Support u8 in aiff. 
Fixes ticket #1960.
Reviewed-by; Paul B Mahol
 2012-11-24 21:21:50 +01:00
Piotr Bandurski
081bf60ec6 c93: signal EOF 2012-11-24 15:04:32 +00:00
Paul B Mahol
05b02e9c0f mmf: simplify code by using FFMIN 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 14:27:55 +00:00
Paul B Mahol
7f321fca23 mmf: signal EOF 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 14:24:13 +00:00
Paul B Mahol
9378a90add omadec: remove stale comment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 11:41:43 +00:00
Paul B Mahol
3d8e684f05 ADPCM IMA Dialogic decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:56:47 +00:00
Paul B Mahol
1a61c7a54b wvenc: multichannel muxing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:20:46 +00:00
Paul B Mahol
1b9467aea1 omaenc: remove superfluous "OMA: " 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:04:20 +00:00
Paul B Mahol
bc5ba1c7fd omaenc: abort for unsupported codecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:04:20 +00:00
Piotr Bandurski
6d6bf250dd riff: fix decoding of 24-bit packed int (type 1, 20-bit) 2012-11-24 10:54:38 +01:00
Carl Eugen Hoyos
95903e3cfd Support G.722 in Sun AU. 2012-11-24 10:43:32 +01:00
Carl Eugen Hoyos
df651cf42e Add an annotation field as required by the specification when muxing Sun AU. 
Reviewed-by: Paul B Mahol
 2012-11-24 10:43:11 +01:00
Michael Niedermayer
09456d0df1 riff: ignore ff_read_riff_info() failure. 
Some files simply contain invalid info tags.
Fixes unrelated bug posted into Ticket1821

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 23:41:57 +01:00
Michael Niedermayer
0efcf16a3e replace av_log(0, by av_log(NULL, 
The first parameter is a pointer and NULL is more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 18:10:02 +01:00
Michael Niedermayer
e9c372362c id3v2: restructure compressed and unsync code 
This should fix the interaction between the 2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 03:28:20 +01:00
Michael Niedermayer
3616afced6 rmdec: fix av_log level and context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 01:19:48 +01:00
Michael Niedermayer
be89693ddc avidec: try to support oddly muxed MMES stream 
Fixes ticket1804

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 23:20:35 +01:00
Paul B Mahol
6aa6baa4f2 xmv: signal EOF 
Fixes #1946.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-22 20:37:24 +00:00
Michael Niedermayer
66b45d8f7a movenc: fix assert failure caused by rounding. 
Fixes Ticket1820

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 20:58:06 +01:00
Paul B Mahol
32cd3a7c16 ADPCM AFC decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-22 19:27:44 +00:00
Michael Niedermayer
08e26e7f5c id3v2: print ver/flags/len on debug level. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 19:31:04 +01:00
Michael Niedermayer
a9cfbf6d4b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  id3v2: fix reading unsynchronized frames.
  cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
  apetag: fix error handling in ff_ape_parse_tag()

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 15:36:50 +01:00
Anton Khirnov
9ae80e6a9c id3v2: fix reading unsynchronized frames. 
Current code would incorrectly process e.g. 'ff 00 ff 00 ff' to
'ff ff ff', while it should be 'ff ff 00 ff'.

Fixes Bug 395.

CC: libav-stable@libav.org
 2012-11-22 13:40:04 +01:00
Aleksi Nurmi
492a5f835c brender_pix: a new image decoder 
PIX is an image file format that was used by the BRender 3d engine.

Signed-off-by: Aleksi Nurmi <aleksi.nurmi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 01:06:25 +01:00
Peter Ross
bdba96e93c use correct doxygen parameter direction syntax 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:56:15 +01:00
Peter Ross
9ccc349f77 ensure comment blocks that contain doxygen commands start with double asterix 
Reveiwed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:55:15 +01:00
Piotr Bandurski
88161b2a52 siff: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:52:20 +01:00
Piotr Bandurski
9530439e5f segafilm: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:51:21 +01:00
Piotr Bandurski
1ed7ca00dc bethsoftvid: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:22:38 +01:00
Piotr Bandurski
425d0888c3 bfi: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:22:38 +01:00
Paul B Mahol
8e6957964e yop: fix 10l typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 20:15:02 +00:00
Peter Ross
0705cbd002 bink: return AVERROR_EOF upon reaching end of file 
Fixes ticket #1935.

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 19:25:20 +01:00
Paul B Mahol
e4e7846db8 cdxl: use url_feof() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 16:39:44 +00:00
Paul B Mahol
168a7f06de rawenc: cosmetics: reindent 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 15:34:45 +00:00
Xi Wang
b655cfefaf apetag: fix error handling in ff_ape_parse_tag() 
The following error handling is broken due to signedness.

    int file_size;
    uint32_t tag_bytes;
    int64_t tag_start;
    ...
    tag_start = file_size - tag_bytes - APE_TAG_FOOTER_BYTES;
    if (tag_start < 0) { ... }

Note that tag_bytes is unsigned, which makes the right-hand side of
`tag_start = ...' unsigned, too.  The 32-bit unsigned value is then
zero-extended to 64 bits.  Therefore, tag_start must be non-negative,
and the check (tag_start < 0) is always false, which breaks the error
handling.  This patch fixes the check.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-11-21 14:35:26 +01:00
Piotr Bandurski
4bf3bc6f96 sierravmd: signal EOF 2012-11-21 10:38:52 +00:00
Paul B Mahol
e94f429474 cafdec: return right code if EOF is reached 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 10:34:38 +00:00
Piotr Bandurski
25d8ebd422 thp: signal EOF 2012-11-21 10:21:54 +00:00
Piotr Bandurski
9a0ecd507a rpl: return AVERROR_EOF instead of -1 2012-11-21 09:48:46 +00:00
Clément Bœsch
030db0c1dd lavf/hls: whitespace cosmetics after 23db5418. 2012-11-21 08:01:51 +01:00
Clément Bœsch
57d7e21c34 lavf: move libmodplug registration with the other ext lib. 
Also remove the duplicated #if.
 2012-11-21 08:00:35 +01:00
LYF
23db5418ed hls: create an AVProgram for each variant 
Without the information, application may choose audio from one variant
and video from another variant, which leads to fetch two variants from
network. This enables av_find_best_stream() to find matching audio and
video streams, so that only one variant is fetched from network.

Signed-off-by: LYF <yefei.li@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 01:24:01 +01:00
Stefano Sabatini
8b6aeb1fcd lavf/segment: fix value for the M3U8 EXT-X-MEDIA 
From the M3U8 specification:
|The EXT-X-MEDIA-SEQUENCE tag indicates the sequence number of the first
|URI that appears in a Playlist file.

Previously it was using the list index number. Also remove now unused
list_count field.
 2012-11-20 22:48:28 +01:00
Stefano Sabatini
5a1ac463e0 lavf/segment: do not pre-increment segment_idx value 
Increment the value just when a new segment with the given index is
started. Simplify logic, improve readability.
 2012-11-20 22:48:28 +01:00
Stefano Sabatini
2b31aa8895 lavf/segment: unbreak behavior for segment muxer 
The segment muxer presumes the use of AVFMT_GLOBALHEADER, ssegment should
be use in case of formats which requires no global headers.

Regression introduced when merging
0826d8513d.
 2012-11-20 22:48:28 +01:00
Stefano Sabatini
b6c05879ea lavf/segment: consistently use "seg" in segment_start() 2012-11-20 22:48:28 +01:00
Clément Bœsch
cc88734c3c lavf/srtdec: trim line break event separators from packet. 
The muxer add them automatically, so this avoid having a bunch of line
breaks all over the output files. One '\n' is still kept/added because
the lavc subrip decoder seems to have trouble with line ending abruptly
(it doesn't flush correctly the tags). This bug is harmless but should
be fixed; though, this doesn't look like a trivial change. When this bug
gets fixed, we can consider removing the '\n' at the end of the packet.

The 2048B buffer limit was also removed while moving to AVBPrint API.
Note that this doesn't really matter since the decoder is limited as
well.
 2012-11-20 22:38:39 +01:00
Carl Eugen Hoyos
d513fb1c75 Add -skip_initial_bytes option. 
Fixes ticket #1909.
 2012-11-20 22:04:14 +01:00
Carl Eugen Hoyos
b1e190d0fd Correctly signal EOF when demuxing caf files. 2012-11-20 22:04:03 +01:00
ChanMin Kim
4293464705 lavf/segment: do not copy codec_tag when not available 
Some muxers do not allow stream if codec_tag is incompatible.

Sometimes the passed input codec's codec_tag is not compatible with the
output muxer.

Because the codec_tag field of the segment muxer cannot be set, ffmpeg.c
doesn't know how to handle these cases.

Signed-off-by: ChanMin Kim <kcm1700@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 19:19:31 +01:00
Michael Niedermayer
07a866282f oggdec: fix memleak on header parsing failure 
Fixes Ticket1931

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 15:14:12 +01:00
Peter Ross
ed27ed9f4f iff: DEEP RLE 32-bit decoder 
Fixes ticket #1046.

Signed-off-by: Peter Ross <pross@xvid.org>
 2012-11-20 09:49:49 +11:00
Gavin Kinsey
19660a8876 Allow use of @ character in username and passwords embedded in URLs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 18:02:28 +01:00
Paul B Mahol
305fe9ae59 nut: add tag for PCM signed 8-bit planar 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-19 09:55:20 +00:00
Carl Eugen Hoyos
a5d4e94a97 Support iLBC in caf. 2012-11-19 10:19:50 +01:00
Marton Balint
4bee03034b lavf: let av_find_best_stream use bitrate info if available 
I guess the user expects to see the stream with the highest bitrate, not with
the most frames, this is especially useful for multi bitrate streams.

This patch changes av_find_best_stream to select the stream based on a number
of conditions, the first condition has the highest priority, the last condition
has the lowest:

1) Select the stream with the highest FFMIN(5, codec_info_nb_frames) value
2) Select the stream with the highest bitrate
3) Select the stream with the highest codec_info_nb_frames
4) Select the first stream

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 13:57:08 +01:00
Peter Ross
05001dd7ca iff: process DEEP DLOC chunk to obtain image dimensions 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 13:47:17 +01:00
Peter Ross
d26eeb0dc1 iff: recognise more DEEP colorspaces 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 13:46:36 +01:00
Paul B Mahol
d0a503c97c ast: check bit depth too 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 12:29:05 +00:00
Paul B Mahol
f5f29910dd img2enc: remove dead code 
Nothing in lavc sets extradata for such codec and this is wrong place
for it anyway.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 12:09:20 +00:00
Carl Eugen Hoyos
ab82b77822 Fix possible NULL-pointer dereference when decoding mov files. 
Fixes CID743440, introduced in 850e5c0.
 2012-11-18 08:52:50 +01:00
Paul B Mahol
d98364edce smush: check audio packet size 
Fixes null pointer dereference.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-17 19:58:54 +00:00
Michael Niedermayer
fb1ea777b3 electronicarts: check size before reading duration out of a chunk. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 20:43:56 +01:00
Paul B Mahol
461ecea068 AST demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-17 19:30:08 +00:00
Paul B Mahol
9ba41ae63e PCM signed 16-bit big-endian planar decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-17 19:30:08 +00:00
Paul B Mahol
37e2a9783f lxfdec: remove deplanarization hack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-17 19:30:04 +00:00
Paul B Mahol
467dfd5dfa PCM signed 24-bit/32-bit little-endian planar decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-17 19:09:43 +00:00
Michael Niedermayer
f96a653184 flvdec: disable hack that attempts to parse aac bitstream in the flv demuxer. 
I was unable to find a file that needs this hack, if you have one please
contact us!
Fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 18:49:08 +01:00
Stefano Sabatini
a0f2d3fff5 lavf/avienc: return proper error codes, and provide some more feedback 2012-11-17 11:15:00 +01:00
Michael Niedermayer
caedd51e56 mxfdec: fix potential integer overflow in mxf_compute_sample_count() 
Fixes CID743442
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 02:20:50 +01:00
Matthieu Bouron
83cab07a4c mxfdec: set audio packets pts 
Also fix playback of ntsc files.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-16 14:12:37 +01:00
Xidorn Quan
8ee6db393c mov: add more udta meta data recognition 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-16 14:12:37 +01:00
Clément Bœsch
2dd0da787c lavf/mp3enc: make sure the header is valid before writing audio pkt. 
An invalid header can lead avpriv_mpegaudio_decode_header() to overread
and/or div by zero.
 2012-11-16 14:11:08 +01:00
Janne Grunau
c84cce5a99 mxfdec: fix typo in mxf_read_seek() 
Check the number of index tables before using byte offset based seeking
instead of the index_tables pointer.

Found by Måns Rullgård <mans@mansr.com>.
 2012-11-15 17:37:09 +01:00
Carl Eugen Hoyos
850e5c041d Read QuickTime version 1 audio fields in broken mov files. 
Matrox XMIO capture boards write files with major brand "JUNK"
and compatible brand "qt  " that contain QuickTime version 1
audio fields.

Fixes ticket #1881.
 2012-11-15 14:38:19 +01:00
Michael Niedermayer
a9b1536a01 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  bgmc: Fix av_malloc checks in ff_bgmc_init()
  rtp: set the payload type as stream id

Conflicts:
	libavformat/rtpenc_chain.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-15 11:31:13 +01:00
Michael Niedermayer
4d941eac16 Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040' 
* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
  avformat: clarify stream id for muxing
  fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
  ppc: do not pass redundant compiler flags
  avutil: change GET_UTF8 to not use av_log2()
  segment: fix NULL pointer dereference in seg_write_header()

Conflicts:
	tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-15 11:12:25 +01:00
Michael Niedermayer
a3cb7f992f xwma: check bytes_per_sample, fix division by 0. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-15 00:56:54 +01:00
Luca Barbato
3b4296f414 avformat: clarify stream id for muxing 2012-11-14 20:38:51 +01:00
Luca Barbato
8034130e06 rtp: set the payload type as stream id 
Support multiple video/audio streams with different format in the
same session.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-11-14 20:38:51 +01:00
Paul B Mahol
dbc44667ce Add missing dependency for avr demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-14 18:02:28 +00:00
Michael Niedermayer
87d073eacc mov: Dont try to calculate with unknown durations, fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-14 14:08:44 +01:00
Michael Niedermayer
e13d5e9a4b Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2' 
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
  x86: h264_weight_10bit: port to cpuflags
  libtheoraenc: add missing pixdesc.h header
  avcodec: remove ff_is_hwaccel_pix_fmt
  pixdesc: add av_pix_fmt_get_chroma_sub_sample
  hlsenc: stand alone hls segmenter

Conflicts:
	doc/muxers.texi
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/mpegvideo_enc.c
	libavcodec/tiffenc.c
	libavformat/Makefile
	libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-14 11:59:20 +01:00
Xi Wang
e8769b37fe segment: fix NULL pointer dereference in seg_write_header() 
Since the pointer `oc' is NULL, oc->oformat->name will cause a null
pointer dereference.  This patch changes it to seg->oformat->name.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-11-14 12:33:27 +02:00
Michael Niedermayer
1f1960519a lxfdec: fix "no audio stream" check. avoid null ptrs deref 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-14 00:03:42 +01:00
Michael Niedermayer
af9ec3dd1d av_probe_input_format3: support NULL as buffer. Fixes null ptr deref 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-13 22:21:10 +01:00
Michael Niedermayer
eab022d863 mpegts: prevent freeing ones own section in pat_cb 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-13 21:45:53 +01:00
Michael Niedermayer
4392e69ad4 mov: check stps correctly, avoid overreading 1 element. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-13 21:45:53 +01:00
Michael Niedermayer
3669915e93 dvdec: check ipcm more completely, avoid assert failure. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-13 21:45:53 +01:00
Clément Bœsch
41ebbb3b04 lavf/wtvenc: fix s[tp]_pairs memleak. 2012-11-13 20:02:43 +01:00
Michael Niedermayer
4facddd568 mpegts: dont set stream info when a decoder has already been opened. 
Fixes assertion failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-13 15:44:13 +01:00
Michael Niedermayer
327cd0d09b mpegts: prevent freeing ones own section in pmt_cb 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-13 15:44:13 +01:00
Paul B Mahol
09a0392341 paf: set channel layout 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-13 13:25:19 +00:00
Michael Niedermayer
799d749c77 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (24 commits)
  yop: set channel layout
  wtv: set channel layout for mpeg audio
  westwood_aud: set channel layout
  wc3movie: set channel layout
  tmv: set channel layout
  tiertexseq: set channel layout
  swfdec: set channel layout
  sol: set channel layout
  smacker: set channel layout
  siff: set channel layout
  sierravmd: set channel layout
  rtpdec_amr: set channel layout
  rsodec: set channel layout
  rmdec: set channel layout for RA version 3
  qcp: set channel layout
  psxstr: set channel layout
  omadec: set channel layout
  oggparsespeex: validate channel count and set channel layout
  nuv: set channel layout
  mxg: set channel layout
  ...

Conflicts:
	libavformat/swfdec.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-13 11:09:38 +01:00
Michael Niedermayer
7eb40d85f2 Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b' 
* commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits)
  jvdec: set channel layout
  iss: set channel layout
  ipmovie: set channel layout
  iff: set channel layout
  idroqdec: set channel layout
  gxfdec: set channel layout when applicable
  gsmdec: set channel layout
  flvdec: set channel layout
  dv: set channel layout
  dsicin: set channel layout
  daud: set channel layout
  cdxl: set channel layout
  bmv: set channel layout
  bink: set channel layout
  bfi: set channel layout
  bethsoftvid: set channel layout
  apc: set channel layout
  amr: set channel_layout
  ppc: replace pointer casting with AV_COPY32
  ppc: fix some unused variable warnings
  ...

Conflicts:
	libavformat/amr.c
	libavformat/iff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-13 10:55:07 +01:00
Luca Barbato
22a0827dff hlsenc: stand alone hls segmenter 
Simplifies usage but has higher latency.
 2012-11-13 01:37:05 +01:00
Michael Niedermayer
abe68364a3 swfdec: check space before copy 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-12 19:29:27 +01:00
Paul B Mahol
87c113f4b3 wv: use right function to read block_samples 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-12 15:50:04 +00:00
Justin Ruggles
b9629acb6b yop: set channel layout 2012-11-12 10:33:23 -05:00
Justin Ruggles
935fbb66ef wtv: set channel layout for mpeg audio 2012-11-12 10:33:23 -05:00
Justin Ruggles
7b48d93e8a westwood_aud: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
2ce7f820d4 wc3movie: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
a94b0267f2 tmv: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
7f348bd764 tiertexseq: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
a3949fe11f swfdec: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
1c7587728c sol: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
bfccd76adb smacker: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
57e590e4b8 siff: set channel layout 2012-11-12 10:33:22 -05:00
Justin Ruggles
a634896cf8 sierravmd: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
c1ac602d53 rtpdec_amr: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
ce842029ce rsodec: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
60a585304c rmdec: set channel layout for RA version 3 2012-11-12 10:33:21 -05:00
Justin Ruggles
444b79c18a qcp: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
b5e3e77711 psxstr: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
c9759eb426 omadec: set channel layout 2012-11-12 10:33:21 -05:00
Justin Ruggles
ef1b23ad21 jvdec: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
d4088efbe2 oggparsespeex: validate channel count and set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
4371131283 iss: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
232e9c4c4b nuv: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
cc57228e31 mxg: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
66d7ceb4aa mvi: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
f6c6e5aac1 mpc7: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
f24b0b1b6c mmf: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
87199d34db mm: set channel layout 2012-11-12 10:33:20 -05:00
Justin Ruggles
41a2d9590d ipmovie: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
024e03701c iff: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
73e2007f3d idroqdec: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
f6c3adde41 gxfdec: set channel layout when applicable 2012-11-12 10:33:19 -05:00
Justin Ruggles
d4a105ae5c gsmdec: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
644d8d2e5a flvdec: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
d5ca70b103 dv: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
49e7af06f2 dsicin: set channel layout 2012-11-12 10:33:19 -05:00
Justin Ruggles
a05a63785c daud: set channel layout 
Update FATE reference due to WAVE channel mask now being set correctly.
 2012-11-12 10:33:18 -05:00
Justin Ruggles
0d09a5848f cdxl: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
e8088d6e4b bmv: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
2fe804f316 bink: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
ff50d27a63 bfi: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
b5d1a15d1b bethsoftvid: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
39f0e9b8c6 apc: set channel layout 2012-11-12 10:33:18 -05:00
Justin Ruggles
5595368bcc amr: set channel_layout 2012-11-12 10:33:18 -05:00
Michael Niedermayer
03b078721c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/git-howto.texi
	ffmpeg_filter.c
	libavcodec/flacdec.c
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c
	libavcodec/utils.c
	libavfilter/asrc_anullsrc.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/buffer.c
	libavutil/Makefile
	libavutil/audioconvert.h
	libavutil/channel_layout.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-12 11:32:11 +01:00
Clément Bœsch
3704804c8f lavf/assenc: add non strict ts flag. 
ASS can have several events at the same time.
 2012-11-11 22:58:56 +01:00
Michael Niedermayer
5aedee4fac gxf: avoid null ptr deref without streams. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 20:58:04 +01:00
Justin Ruggles
a903f8f087 Include libavutil/channel_layout.h instead of libavutil/audioconvert.h 
Also reorder some other #include when applicable.
 2012-11-11 13:35:12 -05:00
Michael Niedermayer
192db16b9c segafilm: fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 18:32:46 +01:00
Michael Niedermayer
f1d6f013b2 omadec: fix len check in nprobe() prevent out of array access 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 18:16:48 +01:00
Peter Ross
6f78ba8b0b electronic arts: support rare samples containing adpcm_ea_r1 audio 
Fixes ticket #1549.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 12:52:02 +01:00
Peter Ross
d168fcb68f electronicarts: use av_log_ask_for_sample 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 12:51:16 +01:00
Michael Niedermayer
d7da4d47a6 mxfdec: avoid double free and leaks. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 02:20:04 +01:00
Michael Niedermayer
c2ca0163af matroskadec: check h in generic rm packet shuffler 
Fixes crash

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 01:19:44 +01:00
Clément Bœsch
e56b098410 lavf/srtenc: ignore invalid timed packets instead of failing. 
This way we don't abort in the middle of remuxing, just warn about an
event ignored. The index increment is moved to make sure the output
numbers still make sense.
 2012-11-10 22:43:27 +01:00
Michael Niedermayer
eb3dc23705 mov: Make sure no streams after the header lack a timescale. 
Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 13:29:23 +01:00
Piotr Bandurski
cc5c2ef09d riff: add SMV2 FourCC for H264 
sample:

http://samples.mplayerhq.hu/V-codecs/smv2.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 13:16:14 +01:00
Carl Eugen Hoyos
b56ff0b261 Allow forcing a frame size in bytes for image2pipe. 
This allows decoding of concatenated frames encoded in
uncompressed formats like v210.
The frame size cannot be generally calculated, FFmpeg
also supports broken encoders.

Fixes ticket #1869.
 2012-11-10 02:25:17 +01:00
Carl Eugen Hoyos
f91f049a22 Add yuv4xxp12 and yuv4xxp14 pixel formats to y4m encoder and decoder. 
Reviewed-by: Paul B Mahol
 2012-11-10 02:19:55 +01:00
Piotr Bandurski
49c2f2d57e riff: add GXVE FourCC for WMV2 
sample:

http://samples.mplayerhq.hu/V-codecs/ViVD/vivd.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 01:58:51 +01:00
Michael Niedermayer
c63e76ba35 ebml_read_binary: use fast_padded_malloc() 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 23:35:58 +01:00
Michael Niedermayer
e481ba2ed7 vqf: check samplerate, avoid division by 0. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 18:05:19 +01:00
Michael Niedermayer
7989f7e0b5 xmv: Fix integer overflow 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 17:18:01 +01:00
Michael Niedermayer
7ec1fe1f47 lavf: Dont compare absolute to relative timestamps in duration gcd 
This prevents a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 14:59:43 +01:00
Michael Niedermayer
1b5a6d3c49 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flacenc: ensure the order is within the min/max range in LPC order search
  avconv: rescale packet duration to muxer time base when flushing encoders
  add 24-bit FLAC encoding to Changelog
  rtpenc_aac: Fix calculation of the header size
  x86: h264_intrapred: port to cpuflags

Conflicts:
	Changelog
	libavformat/rtpenc_aac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 10:29:51 +01:00