Commits · c6abf214923ae8ee07456c5594f632a10499442b · Linshizhi / ffmpeg.wasm-core

11 Feb, 2012 3 commits

tta: do not leak memory if bps == 3 · c6abf214

Paul B Mahol authored Feb 10, 2012

In bps == 3 case output is decoded directly.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

c6abf214

buildsys: Fix shared lib build of MPlayer. · a697a185
Ingo Brückl authored Feb 10, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a697a185

Merge remote-tracking branch 'qatar/master' · a78f6b8c

Michael Niedermayer authored Feb 11, 2012

* qatar/master: (38 commits)
  v210enc: remove redundant check for pix_fmt
  wavpack: allow user to disable CRC checking
  v210enc: Use Bytestream2 functions
  cafdec: Check return value of avio_seek and avoid modifying state if it fails
  yop: Check return value of avio_seek and avoid modifying state if it fails
  tta: Check return value of avio_seek and avoid modifying state if it fails
  tmv: Check return value of avio_seek and avoid modifying state if it fails
  r3d: Check return value of avio_seek and avoid modifying state if it fails
  nsvdec: Check return value of avio_seek and avoid modifying state if it fails
  mpc8: Check return value of avio_seek and avoid modifying state if it fails
  jvdec: Check return value of avio_seek and avoid modifying state if it fails
  filmstripdec: Check return value of avio_seek and avoid modifying state if it fails
  ffmdec: Check return value of avio_seek and avoid modifying state if it fails
  dv: Check return value of avio_seek and avoid modifying state if it fails
  bink: Check return value of avio_seek and avoid modifying state if it fails
  Check AVCodec.pix_fmts in avcodec_open2()
  svq3: Prevent illegal reads while parsing extradata.
  remove ParseContext1
  vc1: use ff_parse_close
  mpegvideo parser: move specific fields into private context
  ...

Conflicts:
	libavcodec/4xm.c
	libavcodec/aacdec.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/mpeg4video_parser.c
	libavcodec/svq3.c
	libavcodec/v210enc.c
	libavformat/cafdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a78f6b8c

10 Feb, 2012 37 commits
- Partially revert "Fix png decoding on x86." · 394d41ee
  Reimar Döffinger authored Feb 10, 2012
```
This partially reverts commit 58dabf7b.
It is no longer necessary to use unaligned mov.
The swapped mov argument fix remains though.
```
  394d41ee
- Fix bitexact intra mismatch control. · 3fe00cac
  Reimar Döffinger authored Feb 10, 2012
```
The DC coefficient should be included, too.
This probably was missed because DC quantizer is always
even for MPEG-1/2 but this function is also used for MPEG-4.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  3fe00cac
- mpegvideodec: minor simplifications. · 5338566e
  Reimar Döffinger authored Feb 10, 2012
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  5338566e
- msmpeg4: replace 999999 by INT_MAX and initial by a valid index. · af46ca73
  Michael Niedermayer authored Feb 10, 2012
```
Fixes Ticket990
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  af46ca73
- v210enc: remove redundant check for pix_fmt · f98ede7e
  Paul B Mahol authored Feb 05, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  f98ede7e
- wavpack: allow user to disable CRC checking · c388558d
  Paul B Mahol authored Feb 10, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  c388558d
- v210enc: Use Bytestream2 functions · eeb9e61a
  Aneesh Dogra authored Feb 08, 2012
```
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  eeb9e61a
- cafdec: Check return value of avio_seek and avoid modifying state if it fails · af701d42
  Joakim Plate authored Feb 10, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  af701d42
- yop: Check return value of avio_seek and avoid modifying state if it fails · b69c2e0e
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  b69c2e0e
- tta: Check return value of avio_seek and avoid modifying state if it fails · e54165aa
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  e54165aa
- tmv: Check return value of avio_seek and avoid modifying state if it fails · 066ad092
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  066ad092
- r3d: Check return value of avio_seek and avoid modifying state if it fails · c7b08bc0
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  c7b08bc0
- nsvdec: Check return value of avio_seek and avoid modifying state if it fails · 8dcd00ea
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  8dcd00ea
- mpc8: Check return value of avio_seek and avoid modifying state if it fails · 97aa0929
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  97aa0929
- jvdec: Check return value of avio_seek and avoid modifying state if it fails · 9712e82a
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  9712e82a
- filmstripdec: Check return value of avio_seek and avoid modifying state if it fails · 64476d7e
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  64476d7e
- ffmdec: Check return value of avio_seek and avoid modifying state if it fails · d7c11b11
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  d7c11b11
- dv: Check return value of avio_seek and avoid modifying state if it fails · 8332321c
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  8332321c
- bink: Check return value of avio_seek and avoid modifying state if it fails · 3371e896
  Joakim Plate authored Feb 03, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  3371e896
- ffmpeg: prefer NULL over 0 for av_log context pointer parameter. · a3c4371f
  Clément Bœsch authored Feb 10, 2012
  
  a3c4371f
- ffmpeg: move quality parameter to do_video_out() scope. · 158bd596
  Clément Bœsch authored Feb 08, 2012
```
This make do_video_out() and do_audio_out() consistent. Also simplifies
callers.
```
  158bd596
- ffmpeg: make use of ret error out in transcode_video(). · 63b5e99f
  Clément Bœsch authored Feb 08, 2012
  
  63b5e99f
- ffmpeg: move filtered_frame to the CONFIG_AVFILTER scope. · 086fc4d7
  Clément Bœsch authored Feb 07, 2012
```
This simplifies a bit the #ifdefery.
```
  086fc4d7
- ffmpeg: move do_video_stats() above do_video_out(). · 9303b794
  Clément Bœsch authored Feb 08, 2012
```
This avoid a forward declaration.
```
  9303b794
- ffmpeg: move video stats code to do_video_out(). · a78dd826
  Clément Bœsch authored Feb 07, 2012
```
This will allow some simplifications in transcode_video().
```
  a78dd826
- ffmpeg: move filtered_frame to video stream processing scope. · cf310601
  Clément Bœsch authored Feb 07, 2012
  
  cf310601
- ffmpeg: reindent after video frame polling simplification. · aede21f1
  Clément Bœsch authored Feb 07, 2012
  
  aede21f1
- ffmpeg: simplify video frame polling. · e22c7b4e
  Clément Bœsch authored Feb 07, 2012
```
input_video_filter and output_video_filter can't be NULL at this point.
If they are, the current code would likely crash anyway (since
filtered_frame would be NULL and sent to do_video_out().
```
  e22c7b4e
- ffmpeg: use exit_program() if configure_video_filters() fails. · 4ab4b3db
  Clément Bœsch authored Feb 07, 2012
  
  4ab4b3db
- Check AVCodec.pix_fmts in avcodec_open2() · dcd2b55e
  Paul B Mahol authored Feb 10, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
  dcd2b55e
- svq3: Prevent illegal reads while parsing extradata. · 9e1db721
  Alex Converse authored Feb 10, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
```
  9e1db721
- Add missing newline to mpeg1/2 intra matrix error message. · 3546f680
  Carl Eugen Hoyos authored Feb 10, 2012
  
  3546f680
- Add missing swscale dependency for MP-filters. · baa8ec8d
  Carl Eugen Hoyos authored Feb 10, 2012
```
Reported-by: Hanspeter Niederstrasser

Fixes ticket #989.
```
  baa8ec8d
- Add missing swresample dependency for ffplay. · 342afd12
  Hanspeter Niederstrasser authored Feb 10, 2012
```
Fixes part of ticket #989.
```
  342afd12
- remove ParseContext1 · b24aaabd
  Rafaël Carré authored Feb 09, 2012
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
  b24aaabd
- vc1: use ff_parse_close · 797639dc
  Rafaël Carré authored Feb 08, 2012
```
It works as long as ParseContext is the first member of the private struct
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
  797639dc
- mpegvideo parser: move specific fields into private context · 07554ace
  Rafaël Carré authored Feb 08, 2012
```
This obviates using ParseContext1, which is slated for removal.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
  07554ace