Commits · 41f55277fafeec4f1b3202967bd0ab120948dd69 · Linshizhi / ffmpeg.wasm-core

11 Oct, 2011 1 commit

Merge remote-tracking branch 'qatar/master' · 41f55277

Michael Niedermayer authored Oct 11, 2011

* qatar/master: (34 commits)
  h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
  error_resilience: fix the check for missing references in ff_er_frame_end() for H264
  4xm: prevent NULL dereference with invalid huffman table
  4xmdemux: prevent use of uninitialized memory
  4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
  ptx: check for out of bound reads
  tiffdec: fix out of bound reads/writes
  eacmv: check for out of bound reads
  eacmv: fix potential pointer arithmetic overflows
  adpcm: fix out of bound reads due to integer overflow
  anm: prevent infinite loop
  avsdemux: check for out of bound writes
  avs: check for out of bound reads
  avsdemux: check for corrupted data
  AVOptions: refactor set_number/write_number
  AVOptions: cosmetics, rename static av_set_number2() to write_number().
  AVOptions: cosmetics, move and rename static av_set_number().
  AVOptions: split av_set_string3 into opt type-specific functions
  avidec: fix signed overflow in avi_sync()
  mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
  ...

Conflicts:
	Changelog
	configure
	libavcodec/ptx.c
	libavcodec/ra144.c
	libavcodec/vaapi_vc1.c
	libavcodec/vc1.c
	libavcodec/version.h
	libavformat/4xm.c
	libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

41f55277

10 Oct, 2011 39 commits
- ffprobe: prefer lowercase section names over uppercase ones · fbb8468f
  Stefano Sabatini authored Oct 08, 2011
```
This is consistent with chapter names. The default writer section names
are converted to uppercase for keeping backward compatibility.
```
  fbb8468f
- h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering() · 4c7a232f
  Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  4c7a232f
- error_resilience: fix the check for missing references in ff_er_frame_end() for H264 · e8ac80fb
  Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  e8ac80fb
- 4xm: prevent NULL dereference with invalid huffman table · 1b1182ce
  Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  1b1182ce
- 4xmdemux: prevent use of uninitialized memory · 79964745
  Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  79964745
- 4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers · 8d518a9c
  Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  8d518a9c
- ptx: check for out of bound reads · dc64f203
  Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  dc64f203
- tiffdec: fix out of bound reads/writes · 04a845ca
  Laurent Aimar authored Sep 30, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  04a845ca
- eacmv: check for out of bound reads · 46cb2f6a
  Laurent Aimar authored Sep 30, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  46cb2f6a
- eacmv: fix potential pointer arithmetic overflows · 8df8a87e
  Laurent Aimar authored Sep 30, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  8df8a87e
- adpcm: fix out of bound reads due to integer overflow · c7f89064
  Laurent Aimar authored Sep 30, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  c7f89064
- anm: prevent infinite loop · 2475f1a8
  Laurent Aimar authored Sep 30, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  2475f1a8
- avsdemux: check for out of bound writes · 6de33611
  Laurent Aimar authored Sep 30, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  6de33611
- avs: check for out of bound reads · de049a95
  Laurent Aimar authored Sep 30, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  de049a95
- avsdemux: check for corrupted data · 76c6971a
  Laurent Aimar authored Sep 30, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
  76c6971a
- libmodplug: do not call av_expr_parse() in case of no expr specified. · 92e36ee5
  Clément Bœsch authored Oct 10, 2011
  
  92e36ee5
- libmodplug: simpler and faster use of eval expr. · 964465eb
  Clément Bœsch authored Oct 10, 2011
  
  964465eb
- AVOptions: refactor set_number/write_number · 7bb1807c
  Anton Khirnov authored Aug 23, 2011
```
write_number() does the actual writing of the supplied
number to destination. Move finding the option and choosing destination
address out of it.
```
  7bb1807c
- AVOptions: cosmetics, rename static av_set_number2() to write_number(). · cf10095f
  Anton Khirnov authored Aug 23, 2011
  
  cf10095f
- AVOptions: cosmetics, move and rename static av_set_number(). · b003d0be
  Anton Khirnov authored Aug 23, 2011
  
  b003d0be
- AVOptions: split av_set_string3 into opt type-specific functions · c8d787d2
  Anton Khirnov authored Aug 23, 2011
```
Also stop attempting to honor the alloc parameter, as things break
horribly in that case.
It will be removed in upcoming successor to av_set_string3.
```
  c8d787d2
- avidec: fix signed overflow in avi_sync() · 1703013c
  Mans Rullgard authored Oct 08, 2011
```
Keeping byte values read from the file as unsigned is consistent
with how they are subsequently used and avoids an undefined left
shift by 24 when bit 7 is set.
Signed-off-by: Mans Rullgard <mans@mansr.com>
```
  1703013c
- mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions. · 0c46e958
  Alex Converse authored Oct 08, 2011
  
  0c46e958
- dnxhddec: handle cid change in bitstream. · 11a32d53
  Baptiste Coudurier authored Jun 26, 2011
  
  11a32d53
- vc1: K&R reformatting cosmetics · 109d8aa1
  Kostya Shishkov authored Oct 10, 2011
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
  109d8aa1
- mxfdec: Move FooterPartition to MXFContext and make sure it's never set to zero · d377deaa
  Tomas Härdin authored Oct 07, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d377deaa
- ra288: log an error message when output buffer is too small. · 8f8f5ae9
  Justin Ruggles authored Sep 14, 2011
```
also return AVERROR(EINVAL) instead of -1.
```
  8f8f5ae9
- ra288: use a more descriptive calculation for output data size · fa6be04b
  Justin Ruggles authored Sep 14, 2011
  
  fa6be04b
- ra144: use macro constants to make the code more understandable. · f10524d5
  Justin Ruggles authored Sep 14, 2011
  
  f10524d5
- ra144dec: log an error message when output buffer is too small. · cadd4d33
  Justin Ruggles authored Sep 14, 2011
```
also return AVERROR(EINVAL) instead of -1.
```
  cadd4d33
- ra144dec: use a more descriptive calculation for output data size · 80bdf7e0
  Justin Ruggles authored Sep 14, 2011
  
  80bdf7e0
- Support playing SMV files. · 4b4a6ebd
  Reimar Döffinger authored Aug 27, 2011
```
Audio and video are interleaved via stream cur_dts - no idea how
reliable this is.
It also cannot display the video properly - it is stored with
about 15 in a single JPEG frame, I cannot think of a reasonable
way to implement this.
Samples: http://samples.mplayerhq.hu/smv/
Format description: http://wiki.multimedia.cx/index.php?title=SMVSigned-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  4b4a6ebd
- libmodplug: add bintext video stream capability. · 86a77114
  Clément Bœsch authored Oct 07, 2011
  
  86a77114
- swresample: fix another broken indent chunk. · ade3ec84
  Clément Bœsch authored Oct 10, 2011
```
Also use a consistent style inside that block.
```
  ade3ec84
- mpegts: reduce av_log level for seek back to begin on unseekable protocols to info level. · b2f88ce2
  Michael Niedermayer authored Oct 10, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b2f88ce2
- lavc: Micro version bump for VC1 interlaced decoding support · 51757ac7
  Mashiat Sarker Shakkhar authored Oct 06, 2011
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  51757ac7
- vc1dec: interlaced stream decoding support 3/3 · cad16562
  Mashiat Sarker Shakkhar authored Oct 06, 2011
```
Cosmetics: break some lines and reformat TODOs
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  cad16562
- vc1dec: interlaced stream decoding support 2/3 · f0c02e1c
  Mashiat Sarker Shakkhar authored Oct 06, 2011
```
Cosmetics: reformat some data tables in vc1data.c
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  f0c02e1c
- vc1dec: interlaced stream decoding support 1/3 · d5b015e4
  Mashiat Sarker Shakkhar authored Oct 06, 2011
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  d5b015e4