Commits · 3ba0bfe71fb18e955ca0110e5a65105d84932fbc · Linshizhi / ffmpeg.wasm-core

13 Dec, 2011 31 commits
- Merge remote-tracking branch 'qatar/master' · 3ba0bfe7
  Michael Niedermayer authored Dec 13, 2011
```
* qatar/master:
  ulti: Fix invalid reads
  lavf: dealloc private options in av_write_trailer
  yadif: support 10bit YUV
  vc1: mark with ER_MB_ERROR bits overconsumption
  lavc: introduce ER_MB_END and ER_MB_ERROR
  error_resilience: use the ER_ namespace
  build: move inclusion of subdir.mak to main subdir loop
  rv34: NEON optimised 4x4 dequant
  rv34: move 4x4 dequant to RV34DSPContext
  aacdec: Use intfloat.h rather than local punning union.

Conflicts:
	libavcodec/h264.c
	libavcodec/vc1dec.c
	libavfilter/vf_yadif.c
	libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  3ba0bfe7
- Support "VLB " audio in NSV files. · 36be045e
  Reimar Döffinger authored Dec 11, 2011
```
See samples/nsv/vlb_audio.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  36be045e
- cleanup: for(int · 16b771b1
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  16b771b1
- clenaup: #ifdec CONFIG* · b39e01a6
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b39e01a6
- lavfi: use the new audio API in amovie source filter. · 0b4e5451
  Clément Bœsch authored Dec 13, 2011
  
  0b4e5451
- lavfi: skip the frame in case of error. · 220481e1
  Clément Bœsch authored Dec 13, 2011
```
This fixes playback with some audio files through filters.
```
  220481e1
- lavc: set pkt_?ts to NOPTS in get_frame_defaults. · f39258d5
  Michael Niedermayer authored Dec 13, 2011
```
Idea-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f39258d5
- Fix all GNU %Ld · 9aeaf629
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9aeaf629
- twinnvq: remove ;; · 35f707ab
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  35f707ab
- decoding example: reset pts/dts after subpacket. · 0e187fd1
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0e187fd1
- ffmpeg: reset dts/pts after decoding the first subpacket · 6c39b3c2
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  6c39b3c2
- ulti: Fix invalid reads · a99273eb
  Gaurav Narula authored Dec 13, 2011
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  a99273eb
- lavf: dealloc private options in av_write_trailer · 4badb386
  Luca Barbato authored Dec 12, 2011
```
Fix the iformat/oformat typo.
```
  4badb386
- yadif: support 10bit YUV · d32eed5c
  Luca Barbato authored Dec 04, 2011
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
  d32eed5c
- vc1: mark with ER_MB_ERROR bits overconsumption · 4f3667ba
  Luca Barbato authored Nov 27, 2011
```
This patch is a generalization of what Michael Niedermayer
fixed in a single case.

The wmv8-drm fate test had been updated accordingly.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
  4f3667ba
- lavc: introduce ER_MB_END and ER_MB_ERROR · 63ccd466
  Luca Barbato authored Nov 27, 2011
```
Simplify a little error resilience calls
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
  63ccd466
- error_resilience: use the ER_ namespace · 5bf2ac2b
  Luca Barbato authored Nov 27, 2011
```
Add the namespace to {AC_,DC_,MV_}{END,ERROR} macros
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
  5bf2ac2b
- msrledec: Check for overreads · 53be37e3
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  53be37e3
- aascdec: Check input buffer size on raw data. · be5db700
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  be5db700
- build: move inclusion of subdir.mak to main subdir loop · 878dda5d
  Mans Rullgard authored Dec 13, 2011
```
Signed-off-by: Mans Rullgard <mans@mansr.com>
```
  878dda5d
- rv34: NEON optimised 4x4 dequant · 4722a03c
  Mans Rullgard authored Dec 12, 2011
```
Signed-off-by: Mans Rullgard <mans@mansr.com>
```
  4722a03c
- rv34: move 4x4 dequant to RV34DSPContext · 40901fc1
  Mans Rullgard authored Dec 12, 2011
```
Signed-off-by: Mans Rullgard <mans@mansr.com>
```
  40901fc1
- aacdec: Use intfloat.h rather than local punning union. · 5cd56e19
  Alex Converse authored Dec 12, 2011
  
  5cd56e19
- mp4enc: Avoid storing sizes in trun when they all match. · a6c4c0f2
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a6c4c0f2
- mp4enc: Only store flags in trun when they differ from the default and set a sane default. · d9a41695
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d9a41695
- mp4enc: dont store durations in trun if they are unneeded. · 1f83f046
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1f83f046
- mp4enc: dont store cts in trun if they are unneeded. · 4a685534
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4a685534
- lavc: use hexadecimal debug print for showing err_recognization values. · 41c2bbaa
  Michael Niedermayer authored Dec 13, 2011
```
They are flags which makes them easier to read as hex than decimal.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  41c2bbaa
- msmpeg4dec: restore error concealment functionality after merge · b9556507
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b9556507
- mpeg4dec: restore error concealment functionality after merge · c9cab022
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c9cab022
- h263dec: restore error concealment functionality after merge · 376ee206
  Michael Niedermayer authored Dec 13, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  376ee206
12 Dec, 2011 9 commits

Merge remote-tracking branch 'qatar/master' · 8bc7fe4d

Michael Niedermayer authored Dec 12, 2011

* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8bc7fe4d

build: Disable avconv more completely while leaving the user the option to enable it · c83ef636
Michael Niedermayer authored Dec 12, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c83ef636
doxygen: misc consistency, spelling and wording fixes · 58c42af7
Diego Biurrun authored Dec 07, 2011

58c42af7

Update seek reference for added metadata to lavf tests. · 31a68ad5

Reimar Döffinger authored Dec 12, 2011

As far as I could see the only change is increased pos values,
which is as expected with additional metadata in the files.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

31a68ad5

vcr1: drop unnecessary emms_c() calls without MMX code · 8b494b7b
Paul B Mahol authored Dec 10, 2011
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
8b494b7b

lavf-regression: minimal metadata test. · 6c723f3f

Reimar Döffinger authored Dec 11, 2011

This tests writing the global "title" metadata.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

6c723f3f

Replace all uses of av_close_input_file() with avformat_close_input(). · cd3716b9
Anton Khirnov authored Dec 11, 2011

cd3716b9

lavf: add avformat_close_input(). · 52660454

Anton Khirnov authored Dec 11, 2011

It sets the supplied AVFormatContext pointer to NULL after freeing it,
which is safer and its name is consistent with other lavf functions.

Also deprecate av_close_input_file().

52660454

lavf: deprecate av_close_input_stream(). · 3a7f7678
Anton Khirnov authored Dec 11, 2011
```
And remove all its uses.
```
3a7f7678