generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
67,678 Commits 24 Branches 241 Tags 173 MiB
fb3eb57369
Commit Graph

30343 Commits

Author SHA1 Message Date
Vittorio Giovara
2b5c1efa14 g2meet: check ff_set_dimensions return value 
CC: libav-stable@libav.org
Bug-Id: CID 1135739
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
e9a6ae775d dpxenc: mention missing break 
Bug-Id: CID 732229
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
c6d7c201df indeo3: check ff_set_dimensions return value 
CC: libav-stable@libav.org
Bug-Id: CID 1135740
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
28d82b7675 vc1dec: refactor check with missing parenthesis 
FATE tests updated accordingly, no visual difference.

CC: libav-stable@libav.org
Bug-Id: CID 1087087
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
e3f50f2471 dnxhdenc: check negative index 
CC: libav-stable@libav.org
Bug-Id: CID 700464
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
b1b1a7370e display: fix order of operands 
CC: libav-stable@libav.org
Bug-Id: CID 1238828 / CID 1238832
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
8dd0a2c5cf libopusenc: prevent an out-of-bounds read by returning early 
CC: libav-stable@libav.org
Bug-Id: CID 1244188
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
b09cf8afc5 libopusenc: check return value 
CC: libav-stable@libav.org
Bug-Id: CID 739870
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
2c98dc75f2 vc1dec: always initialize tx and ty 
CC: libav-stable@libav.org
Bug-Id: CID 1245702 / CID 1245703
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
bdcb5794f0 nellymoserenc: fix array index 
CC: libav-stable@libav.org
Bug-Id: CID 732258
 2014-11-13 01:41:25 +01:00
Michael Niedermayer
29234f5681 vp7: fix checking vp7_feature_value_size() 
CC: libav-stable@libav.org
Bug-Id: CID 1197061
 2014-11-13 01:41:25 +01:00
Michael Niedermayer
aa7c429c4e nellymoserenc: fix array element ordering 
Fixes assertion failures and valgrind warnings in trellis encoder.

CC: libav-stable@libav.org
Bug-Id: CID 732256 / CID 732257
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
68a35473ed 4xm: more thorought check for negative index and negative shift 
CC: libav-stable@libav.org
Bug-Id: CID 1087094
 2014-11-13 01:18:09 +01:00
Michael Niedermayer
d03867c248 avcodec/dvbsubdec: av_assert* instead of assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 20:08:24 +01:00
James Almer
84ccc317ce x86/flacdsp: separate decoder and encoder dsp initialization 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-11-12 14:41:45 -03:00
Michael Niedermayer
39dfe6801a avcodec/dvbsubdec: Cleanup on *malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 17:54:52 +01:00
Michael Niedermayer
9d6ad68fa4 avcodec/h264_parser: Avoid adding SEI to the global header 
Only consider SEI when no PPS has been found yet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 03:28:15 +01:00
Michael Niedermayer
dadc1f5ee9 Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb' 
* commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb':
  tiff: Use av_mallocz_array

Conflicts:
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 00:08:06 +01:00
Michael Niedermayer
940f5c08e5 Merge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde' 
* commit '1b667269062eb6aec0b8726393ea91b7f7f57fde':
  h264_parser: don't stop on SPS_EXT in split

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 23:21:12 +01:00
Michael Niedermayer
287eb69973 Merge commit '443502aed8b814d883825e52e91e4f018955aa66' 
* commit '443502aed8b814d883825e52e91e4f018955aa66':
  dvbsubdec: move shared codepath

Conflicts:
	libavcodec/dvbsubdec.c

The merged code is ignored and the factorization redone with
the code that is in FFmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 23:08:55 +01:00
Michael Niedermayer
e0c36f5825 avcodec/dvbsubdec: Fix 8bit non_mod case 
Untested, i failed to find a sample which triggers this case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 22:57:01 +01:00
Michael Niedermayer
2813dabdd4 avcodec/dvbsubdec: use av_freep() for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 22:20:20 +01:00
Michael Niedermayer
4809ac75fc Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8' 
* commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8':
  dvbsubdec: improve error checking

Conflicts:
	libavcodec/dvbsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 22:19:54 +01:00
Michael Niedermayer
6229f7823e avcodec/dvbsubdec: Add return code to save_subtitle_set() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 22:15:14 +01:00
Michael Niedermayer
4dd85093f1 Merge commit '9e9be5a20c0b36dce1cae11f5f5957886231a764' 
* commit '9e9be5a20c0b36dce1cae11f5f5957886231a764':
  hevc_mvs: prevent unitialized use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 21:57:41 +01:00
Michael Niedermayer
9311026ec7 Merge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d' 
* commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d':
  mpegvideo: check mpv return value

Conflicts:
	libavcodec/mpegvideo.c

See: f4d73f0fb5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 21:22:09 +01:00
Michael Niedermayer
aeb1621d1f Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba' 
* commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba':
  mpeg12enc: increase declared size of block function argument

See: 2cf514354b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 21:16:00 +01:00
Michael Niedermayer
81e3f819bd Merge commit '52f954da7594c31ad94c9bcb54290145b59b27f5' 
* commit '52f954da7594c31ad94c9bcb54290145b59b27f5':
  libavcodec: Unconditionally build xiph.o

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 20:58:33 +01:00
Luca Barbato
c9c7d59b7d tiff: Use av_mallocz_array 
CC: libav-stable@libav.org
 2014-11-11 12:01:00 +01:00
John Stebbins
1b66726906 h264_parser: don't stop on SPS_EXT in split 
Add SPS_EXT, SEI, and subset SPS to codes that are skipped during split.
These codes can come before the PPS and results in incomplete extradata.
 2014-11-11 11:49:55 +01:00
Vittorio Giovara
443502aed8 dvbsubdec: move shared codepath 
CC: libav-stable@libav.org
Bug-Id: CID 1238839
 2014-11-11 11:49:54 +01:00
Vittorio Giovara
2383323661 dvbsubdec: improve error checking 
Use av_mallocz_array instead of iterating and check the returned memory.
Check returned memory and cleanly exit in case of error during the loop.
Avoid a null pointer dereference for invalid data.

CC: libav-stable@libav.org
Bug-Id: CID 29575
 2014-11-11 11:49:54 +01:00
Michael Niedermayer
4cb9f1a774 h264_cabac: fix one fill_rectangle() indentation level 
Bug-Id: CID 1087088
 2014-11-11 11:49:54 +01:00
Jernej Fijačko
1bdd21d975 dvbsubdec: add missing break 
Fix a memory leak too.

CC: libav-stable@libav.org
Bug-Id: CID 732230
 2014-11-11 11:49:54 +01:00
Vittorio Giovara
60b0551334 png_parser: fix size of chunk_lenght 
Fixes the comparison against constant value 0x7fffffff.

CC: libav-stable@libav.org
Bug-Id: CID 1198260
 2014-11-11 11:49:54 +01:00
Michael Niedermayer
a6defd1f5b hevc_cabac: decrease CABAC_MAX_BIN 
Prevents shifts with undefined behavior, as no syntax element has a valid
value greater than 1 << 31.

Bug-Id: CID 1206635
 2014-11-11 11:49:54 +01:00
Vittorio Giovara
9e9be5a20c hevc_mvs: prevent unitialized use 
CC: libav-stable@libav.org
Bug-Id: CID 1244202
 2014-11-11 11:49:47 +01:00
Changjiang Wei
6f2068e626 avcodec/hevc.c: for big negative mvy value, should wait line 0 of ref frame due to edge extending 
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 11:45:20 +01:00
Vittorio Giovara
0e1ebfebc8 4xm: drop unnecessary check 
data_size is always >= 0 in this case.

CC: libav-stable@libav.org
Bug-Id: CID 1238788
 2014-11-11 11:41:49 +01:00
Michael Niedermayer
7c61e4b1a0 hpeldsp: Increase put_no_rnd_pixels_tab[][] size 
CC: libav-stable@libav.org
Bug-Id: CID 991852
 2014-11-11 11:41:49 +01:00
Vittorio Giovara
db71c4926d mjpegenc: fix argument size in encode_mb 
CC: libav-stable@libav.org
Bug-Id: CID 1047235
 2014-11-11 11:41:49 +01:00
Rong Yan
cfaa233962 libavcodec/ppc/me_cmp.c : support little endian in sse8_altivec(), hadamard8_diff8x8_altivec() and hadamard8_diff16x8_altivec() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 11:37:13 +01:00
Rong Yan
bb38cb14cc libavcodec/ppc/me_cmp.c : factorize little and big endian code 
add marcos GET_PERM() LOAD_PIX() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 11:34:38 +01:00
Vittorio Giovara
898e9a24ef mpegvideo: check mpv return value 
CC: libav-stable@libav.org
Bug-Id: CID 1238786
 2014-11-11 11:26:02 +01:00
Michael Niedermayer
fe27aeaeab mpeg12enc: increase declared size of block function argument 
CC: libav-stable@libav.org
Bug-Id: CID 1047236
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-11-11 11:26:02 +01:00
Vittorio Giovara
f349f4b550 mpegvideo: fix size of array 
CC: libav-stable@libav.org
Bug-Id: CID 1238789
 2014-11-11 11:26:02 +01:00
Martin Storsjö
52f954da75 libavcodec: Unconditionally build xiph.o 
vorbis_parser.o is built unconditionally since 5e80fb7ff, and the
unconditionally built parts of it depend on xiph.o.

This fixes builds with --disable-everything.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-11 12:01:16 +02:00
Michael Niedermayer
48efe9ec86 avcodec/utvideodec: Fix undefined behavior in shift 
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 03:35:57 +01:00
Michael Niedermayer
35dcc8a040 avcodec/lagarith: fix integer overflow 
Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 03:19:49 +01:00
Michael Niedermayer
5dcb99033d avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization 
Fixes out of array read
Fixes: asan_heap-oob_2aec5b0_1828_classical_22_16_2_16000_v3c_0_exclusive_0_29.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 23:09:39 +01:00
Jon Morley
8c28a39c2c options_table.h: min value for colorspace is 0 (AVCOL_SPC_RGB) 
The min value for colorspace should be zero and not one since the first
valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 21:18:57 +01:00
Michael Niedermayer
7656c4c6e6 avcodec/utvideodec: fix assumtation that slice_height >= 1 
Fixes out of array read
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 19:45:36 +01:00
Michael Niedermayer
e981de81fe avcodec/lagarith: fix chroma plane width & height 
Fixes out of array read
Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 17:54:50 +01:00
Martin Storsjö
28396d17ff libfdk-aacdec: Support building with the latest version of fdk-aac 
The latest fdk-aac code drop (from android 5.0) changed the channel
layout enums (changing the value of existing enum constants), and
renamed the option for downmixing.

The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts)
can trigger warnings (-Wtautological-constant-out-of-range-compare)
when building with the old FDK AAC releases, where it can't be
out of range with the enum values used there.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-10 09:43:57 +02:00
Michael Niedermayer
f6a8c77afb avcodec/utils: Fix warning: comparison between enum foo and enum bar [-Wenum-compare] 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 02:54:24 +01:00
Michael Niedermayer
9889b29ff4 avcodec/utils: make sidedata remapping table static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 02:53:21 +01:00
Martin Storsjö
b44a242c3d libfdk-aacdec: Support building with the latest version of fdk-aac 
The latest fdk-aac code drop (from android 5.0) changed the channel
layout enums (changing the value of existing enum constants), and
renamed the option for downmixing.

The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts)
can trigger warnings (-Wtautological-constant-out-of-range-compare)
when building with the old FDK AAC releases, where it can't be
out of range with the enum values used there.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 02:46:46 +01:00
Michael Niedermayer
0960cc4cc6 Merge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23' 
* commit 'e3e317e0c015b164b6c2eb8913e393216d78de23':
  lavc: Compact the side-data passthrough

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 00:57:41 +01:00
Lukasz Marek
db2caf0a80 lavc/options: fix shallow copy context 
avcodec_copy_context leaves shallow copy of string/binary/dict options.
Double free/accessing freed memory may occur.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-09 17:56:08 +01:00
Luca Barbato
e3e317e0c0 lavc: Compact the side-data passthrough 2014-11-09 12:29:59 +01:00
Michael Niedermayer
55d592f7d9 avcodec/aacdec: Skip processing channel elements which have not been present 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-09 11:41:13 +01:00
Michael Niedermayer
f9fa560597 avcodec/aacenc: check input for NaN 
Fixes Ticket3762

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-08 23:32:39 +01:00
Carl Eugen Hoyos
e2e36a739d Fix make checkheaders for libavcodec/vorbis_parser.h. 2014-11-08 00:59:37 +01:00
Michael Niedermayer
960c573cc5 avcodec/mjpegdec: support pix fmt id 0x22111111 
Fixes: 4163724_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 15:37:11 +01:00
Rong Yan
79e0255956 libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() put_no_rnd_pixels16_xy2_altivec() put_no_rnd_pixels8_xy2_altivec() avg_pixels8_altivec() avg_pixels8_xy2_altivec() put_pixels16_xy2_altivec() put_pixels8_xy2_altivec() ff_avg_pixels16_altivec() for POWER LE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 12:32:03 +01:00
Michael Niedermayer
b1c99f4c5f avcodec/aacdec: Add table of profile names 
based on tables of aac encoders from libavcodec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 03:09:50 +01:00
Michael Niedermayer
2daae445c0 avcodec/aacdec: print extension type when startcode debugging is on 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 03:09:50 +01:00
Michael Niedermayer
c53a1507aa Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9' 
* commit '199d9f995da53fe2507821f6d96bbc692574e1a9':
  mjpegdec: fix undefined shift

Conflicts:
	libavcodec/mjpegdec.c

See: b432960528
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 18:28:49 +01:00
Michael Niedermayer
ad0cf8e063 Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1' 
* commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1':
  pthreads_frame: Do not leak on failure path

See: 11679e1b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 18:17:33 +01:00
Michael Niedermayer
98d6f0ffef Merge commit '37b3361e755361d4ff14a2973df001c0140d98d6' 
* commit '37b3361e755361d4ff14a2973df001c0140d98d6':
  mpeg12enc: factor out check in encode_dc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 17:28:40 +01:00
Michael Niedermayer
c96a44d0dd Merge commit '0a6664706168dc1049967bec311970d720581625' 
* commit '0a6664706168dc1049967bec311970d720581625':
  mpegvideo_enc: factor out denominator and explicitly cast operands

Conflicts:
	libavcodec/mpegvideo_enc.c

See: c753b56b4d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 17:21:36 +01:00
Michael Niedermayer
5241f90058 Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118' 
* commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118':
  mpegvideo_enc: rework direct mode check

Conflicts:
	libavcodec/mpegvideo_enc.c

See: ad98567198
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 17:14:38 +01:00
Vittorio Giovara
199d9f995d mjpegdec: fix undefined shift 
Add a comment to explain the code.

CC: libav-stable@libav.org
Bug-Id: CID 1194388
 2014-11-06 10:44:46 -05:00
Luca Barbato
ac4a5e3abd pthreads_frame: Do not leak on failure path 
CC: libav-stable@libav.org
Bug-Id: CID 1135767
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-11-06 10:44:46 -05:00
Vittorio Giovara
37b3361e75 mpeg12enc: factor out check in encode_dc 
Makes coverity less confused and the code more readable.

CC: libav-stable@libav.org
Bug-Id: CID 751744
 2014-11-06 10:44:46 -05:00
Vittorio Giovara
0a66647061 mpegvideo_enc: factor out denominator and explicitly cast operands 
CC: libav-stable@libav.org
Bug-Id: CID 608053
 2014-11-06 10:44:46 -05:00
Vittorio Giovara
e0a1d0a2b0 mpegvideo_enc: rework direct mode check 
Remove stray semicolon and share codepaths.

CC: libav-stable@libav.org
Bug-Id: CID 991857
 2014-11-06 10:44:46 -05:00
Vittorio Giovara
5d29efe4b0 mpeg12dec: simplify context duplication 
CC: libav-stable@libav.org
Bug-Id: CID 717453 / CID 717454 / CID 717915
 2014-11-06 10:44:46 -05:00
Michael Niedermayer
e591608753 avcodec/xiph: make extradata argument const 
Fixes "warning: passing argument 1 of avpriv_split_xiph_headers discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 14:41:38 +01:00
Michael Niedermayer
cffd2713e9 Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48' 
* commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48':
  lavc: make avpriv_flac_is_extradata_valid() private on the next bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 14:17:46 +01:00
Michael Niedermayer
cfef947f7f Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14' 
* commit 'c070a8751597e3aa1b443e88464da785d8966b14':
  lavc: make avpriv_flac_parse_streaminfo() private on the next bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 13:54:11 +01:00
Michael Niedermayer
b6a9956396 Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c' 
* commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c':
  lavf: stop using avpriv_flac_parse_streaminfo()

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 13:42:41 +01:00
Michael Niedermayer
f74be3669d Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959' 
* commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959':
  lavc,lavf: switch to the new vorbis parse API

Conflicts:
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 12:05:17 +01:00
Michael Niedermayer
7ffdc7bef2 avcodec/export av_vorbis_parse_frame_flags() 
The other functions where changed in the previous merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 11:58:32 +01:00
Michael Niedermayer
44fa2671e0 Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70' 
* commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70':
  lavc: add a public API for parsing vorbis packets.

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/version.h
	libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 11:21:47 +01:00
Michael Niedermayer
5f7887ca8d Merge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67' 
* commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67':
  vorbis_parser: add an AV prefix to VorbisParseContext

Conflicts:
	libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 11:06:19 +01:00
Michael Niedermayer
a0617025dd Merge commit '8747926' 
* commit '8747926':
  vorbis_parser: use a dedicated AVClass for logging

Conflicts:
	libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 10:50:59 +01:00
Anton Khirnov
acc897e6b1 lavc: make avpriv_flac_is_extradata_valid() private on the next bump 2014-11-06 09:04:56 +01:00
Anton Khirnov
c070a87515 lavc: make avpriv_flac_parse_streaminfo() private on the next bump 2014-11-06 09:04:12 +01:00
Anton Khirnov
7784f47762 lavf: stop using avpriv_flac_parse_streaminfo() 
The only parameters needed by the demuxers are the sample rate and sample
count, which can be trivially extracted manually, without resorting to
an avpriv function.
 2014-11-06 09:02:25 +01:00
Anton Khirnov
2f3fadfbe3 lavc,lavf: switch to the new vorbis parse API 2014-11-06 09:00:46 +01:00
Anton Khirnov
5e80fb7ff2 lavc: add a public API for parsing vorbis packets. 
It is required by (at least) the ogg demuxer.

Mark the current semi-public apriv API for removal.
 2014-11-06 08:51:25 +01:00
Anton Khirnov
6896f95b24 vorbis_parser: add an AV prefix to VorbisParseContext 
This is done in preparation for making it public.
 2014-11-06 08:47:54 +01:00
Anton Khirnov
874792641e vorbis_parser: use a dedicated AVClass for logging 
Currently, the API takes an external AVCodecContext, which is used only
for extradata and logging. This change will allow to it to work without
an AVCodecContext in the following commits.
 2014-11-06 08:47:21 +01:00
Michael Niedermayer
817663897e avcodec/mpegaudio_parser: fix off by 1 error in bitrate calculation 
Fixes Ticket3918

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 00:05:22 +01:00
Reimar Döffinger
a26d0ffa18 vdpau_mpeg4: Do not fail on unknown profile. 
This is a regression, previous code did not require
users to set the profile to use VDPAU.
In addition, ASP is a superset of SP, so there is not
even a good reason to require it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-05 20:07:31 +01:00
Michael Niedermayer
43fee7ad92 Merge commit '4ff670d99bebd97429322719089363d83143477d' 
* commit '4ff670d99bebd97429322719089363d83143477d':
  hwaccel: Deinitialize hardware acceleration early enough

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-05 02:10:46 +01:00
Michael Niedermayer
77f1199e8f avcodec/mpeg12dec: do not trust AVCodecContext input dimensions 
Fixes initial wtv dimensions
Fixes Ticket4070
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-05 02:00:22 +01:00
Michael Niedermayer
ae4bb6c488 Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2' 
* commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2':
  aacdec: add default case in channel layout

Conflicts:
	libavcodec/aacdec.c

Note, the default case is currently unreachable

See: a48b890392
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 22:35:41 +01:00
Rémi Denis-Courmont
4ff670d99b hwaccel: Deinitialize hardware acceleration early enough 
The application will destroy the underlying hardware handles when
get_format() gets called again. Also this ensures the
deinitialization takes place if the get_format callback returns an
error.

Regression from 1c80c9d7ef.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-11-04 22:15:17 +01:00