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

28 Jul, 2013 5 commits

Michael Niedermayer authored Jul 28, 2013

* commit 'c8f0b20b':
  avidec: Let the inner dv demuxer take care of discarding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3afcddcf

Merge commit '' · d7812209

Michael Niedermayer authored Jul 28, 2013

* commit '10aa44aa':
  avidec: K&R formatting cosmetics

Conflicts:
	libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d7812209

Merge commit '' · 1ecf3802

Michael Niedermayer authored Jul 28, 2013

* commit '37063714':
  build: Only check FATE dependencies when running FATE tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>

1ecf3802

Merge commit '' · 102397d2

Michael Niedermayer authored Jul 28, 2013

* commit '16c22122':
  h264: K&R formatting cosmetics

Conflicts:
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

102397d2

Merge commit '' · edab63a4

Michael Niedermayer authored Jul 28, 2013

* commit '96668944':
  buffersink: K&R formatting cosmetics

Conflicts:
	libavfilter/buffersink.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

edab63a4

27 Jul, 2013 29 commits
- lavc: do not override format if neither text nor bitmap codec prop is set · 63c01135
  Marton Balint authored Jul 27, 2013
```
Some decoders may output both, this way the decoder can set it.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  63c01135
- dpx: use av_image_copy_plane() · 94ad38e2
  Paul B Mahol authored Jul 27, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  94ad38e2
- dpxenc: cosmetics: reindent · 6a574942
  Paul B Mahol authored Jul 27, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  6a574942
- targa_y216dec: remove empty function · 9d099b9a
  Paul B Mahol authored Jul 27, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  9d099b9a
- zmbv: return meaningful error code · 0909f3ed
  Paul B Mahol authored Jul 27, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  0909f3ed
- utvideoenc: use av_image_copy_plane() · 60a7fac6
  Paul B Mahol authored Jul 27, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  60a7fac6
- Forward interlaced field information from mov to v210 decoder. · 84e345b3
  Tim.Nicholson authored Jul 27, 2013
```
Reported and tested by Dave Rice.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
```
  84e345b3
- doc/codecs: fix dangling reference to codec-options chapter · b4bd21b7
  Stefano Sabatini authored Jul 27, 2013
  
  b4bd21b7
- avidec: Let the inner dv demuxer take care of discarding · c8f0b20b
  Luca Barbato authored Jul 27, 2013
```
CC: libav-stable@libav.org
```
  c8f0b20b
- avidec: K&R formatting cosmetics · 10aa44aa
  Luca Barbato authored Jul 27, 2013
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
  10aa44aa
- build: Only check FATE dependencies when running FATE tests · 37063714
  Diego Biurrun authored Jul 18, 2013
```
Only check dependencies if invoking the make targets 'check'
or anything matching 'fate%' except 'fate-rsync'.
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  37063714
- avcodec/vorbisenc: change 6 asserts to av_asserts() · 3adf054b
  Michael Niedermayer authored Jul 27, 2013
```
speed relevant ones use av_assert2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3adf054b
- avcodec/mpegvideo: update disabled assert() to av_assert0() · 5e763920
  Michael Niedermayer authored Jul 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5e763920
- exr: set pict_type · 88b071a4
  Paul B Mahol authored Jul 27, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  88b071a4
- targa: set pict_type · d9954ccf
  Paul B Mahol authored Jul 27, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  d9954ccf
- escape130: make "chroma_vals" static · 3ea5d01a
  Paul B Mahol authored Jul 26, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  3ea5d01a
- lclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata · 6dbcecd7
  Paul B Mahol authored Jul 26, 2013
```
Also check return value.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  6dbcecd7
- lclenc: cosmetics: reindent · 573018c6
  Paul B Mahol authored Jul 26, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  573018c6
- sgidec: safer check for buffer overflow · 86e722ab
  Paul B Mahol authored Jul 26, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  86e722ab
- sgidec: return meaningful error codes · 997e2b59
  Paul B Mahol authored Jul 26, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  997e2b59
- sgidec: simplify return path · 5efa5103
  Paul B Mahol authored Jul 26, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  5efa5103
- h264: K&R formatting cosmetics · 16c22122
  Diego Biurrun authored Jul 26, 2013
  
  16c22122
- buffersink: K&R formatting cosmetics · 96668944
  Diego Biurrun authored Jul 26, 2013
  
  96668944
- Merge remote-tracking branch 'qatar/master' · e8023dba
  Michael Niedermayer authored Jul 27, 2013
```
* qatar/master:
  wtv: Drop some casts that now are unnecessary

Conflicts:
	libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  e8023dba
- Merge commit '86f042dc' · 90279285
  Michael Niedermayer authored Jul 27, 2013
```
* commit '86f042dc':
  wtv: Make WTV_SECTOR_BITS a 64 bit constant

Conflicts:
	libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  90279285
- Merge commit '80ade798' · e64dc86a
  Michael Niedermayer authored Jul 27, 2013
```
* commit '80ade798':
  AIX: add support for shared builds
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  e64dc86a
- Merge commit 'b5123601' · 103b8d87
  Michael Niedermayer authored Jul 27, 2013
```
* commit 'b5123601':
  avio: Don't set the seekable flag if no seek function is provided

See: 65035508Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  103b8d87
- Merge commit '1297f7b8' · 5cb3d35d
  Michael Niedermayer authored Jul 27, 2013
```
* commit '1297f7b8':
  rtpenc: Fix some odd comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  5cb3d35d
- Merge commit '779e6c2b' · 2fffc05f
  Michael Niedermayer authored Jul 27, 2013
```
* commit '779e6c2b':
  lavfi: add attribute_align_arg to all public entry points

Conflicts:
	libavfilter/buffersink.c

See: af2a196eMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  2fffc05f
26 Jul, 2013 6 commits
- avfilter/vf_scale: set in_color_matrix default to "auto" · 8720d3ac
  Michael Niedermayer authored Jul 26, 2013
  
  8720d3ac
- swscale/fill_rgb2yuv_table: fix default detection · 8efe96ee
  Michael Niedermayer authored Jul 26, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8efe96ee
- avfilter/vf_scale: use sws_getCoefficients() · f3f4e133
  Michael Niedermayer authored Jul 26, 2013
```
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f3f4e133
- libavcodec/mpegvideo: change some asserts to av_assert0() · 205f423e
  Michael Niedermayer authored Jul 26, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  205f423e
- avcodec/mpegvideo: replace assert about interlaced EC by debug av_log() · c88bbc01
  Michael Niedermayer authored Jul 26, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c88bbc01
- wtv: Drop some casts that now are unnecessary · 979e9e8f
  Martin Storsjö authored Jul 26, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  979e9e8f