Commits · fadf845973aeb47d1b0bf3eac552394fd8a71437 · Linshizhi / ffmpeg.wasm-core

06 Feb, 2013 11 commits

Michael Niedermayer authored Feb 06, 2013

* commit '48a4ffa7':
  asf: K&R formatting cosmetics
  vc1dec: use codec_id instead of codec_tag for VC1IMAGE
  sh4: drop unused functions

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

fadf8459

flac: add channel layout masks for streams with 7 or 8 channels · 7af876a9
Tim Walker authored Feb 06, 2013
```
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
```
7af876a9
lavc/bink: Chech for malloc failure · 8ab2173e
James Almer authored Feb 06, 2013
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
8ab2173e

Merge commit '' · 6c388848

Michael Niedermayer authored Feb 06, 2013

* commit '620289a2':
  sh4: Fix silly type vs. variable name search and replace typo
  configure: Group all hwaccels together in a separate variable
  Add av_cold attributes to arch-specific init functions

Conflicts:
	configure
	libavcodec/arm/mpegvideo_armv5te.c
	libavcodec/x86/mlpdsp.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideoenc.c
	libavcodec/x86/videodsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

6c388848

dsputil: fixup half a dozen bugs with ptrdiff vs int linesize · 0ddca7d4
Michael Niedermayer authored Feb 06, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0ddca7d4

Merge commit '' · ede45c4e

Michael Niedermayer authored Feb 06, 2013

* commit '25841dfe':
  Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.

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

ede45c4e

asf: K&R formatting cosmetics · 48a4ffa7
Diego Biurrun authored Feb 05, 2013

48a4ffa7

vc1dec: use codec_id instead of codec_tag for VC1IMAGE · 77bcb896

Vladimir Pantelic authored Feb 05, 2013

the rest of the code is using codec_id everywhere already
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>

77bcb896

ffmpeg: do not call exit from exit_program() · 127ff886
Michael Niedermayer authored Feb 06, 2013
```
This should fix  Ticket2116
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
127ff886

vdpau: Rename union, avoid name conflict with vdpau · 68dfe530

Michael Niedermayer authored Feb 05, 2013

Fixes Ticket2203
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

68dfe530

ffmpeg: dont allow -flags to override -pass · ccf9dd00
Michael Niedermayer authored Feb 06, 2013
```
Fixes Ticket2154
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ccf9dd00

05 Feb, 2013 29 commits
- lavf/segment: extend PTS debugging log with -reset_timestamps · a1278796
  Stefano Sabatini authored Feb 05, 2013
  
  a1278796
- ffplay: report video frame changes only in debug mode · 212bb649
  Stefano Sabatini authored Feb 03, 2013
```
In particular, remove distracting message:
"Video frame changed from size:0x0 format:none serial:-1 to ..."
```
  212bb649
- ffplay: extend feedback in case of video changes · 58c4b0f9
  Stefano Sabatini authored Feb 03, 2013
  
  58c4b0f9
- sh4: drop unused functions · b2a722a8
  Luca Barbato authored Feb 05, 2013
```
{avg,put}_pixels4_c are not used.
```
  b2a722a8
- dvenc: dont fail hard if the timecode is invalid · f0eacbc7
  Michael Niedermayer authored Feb 05, 2013
```
Instead just dont store the timecode
Fixes Ticket2187
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f0eacbc7
- sh4: Fix silly type vs. variable name search and replace typo · 620289a2
  Diego Biurrun authored Feb 05, 2013
  
  620289a2
- movtextenc: fix pointer messup and out of array accesses · b0635e2f
  Michael Niedermayer authored Feb 05, 2013
```
Fixes Ticket2187
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b0635e2f
- Merge remote-tracking branch 'rdp/combined' · f7b7f021
  Michael Niedermayer authored Feb 05, 2013
```
* rdp/combined:
  hdyc col
  dshow: use standardized raw pixel format lookup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  f7b7f021
- ljpegenc: allocate needed scratch-buffer · c2dd5a18
  Michael Niedermayer authored Feb 05, 2013
```
Fixes null pointer dereference
Fixes Ticket2207
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c2dd5a18
- riff: fix infinite loop · a8343bfb
  Michael Niedermayer authored Feb 05, 2013
```
Fixes Ticket2241
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a8343bfb
- configure: Group all hwaccels together in a separate variable · 70b348ec
  Diego Biurrun authored Feb 05, 2013
  
  70b348ec
- Add av_cold attributes to arch-specific init functions · c9f933b5
  Diego Biurrun authored Feb 01, 2013
  
  c9f933b5
- libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream · 2b20397e
  Michael Niedermayer authored Feb 05, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2b20397e
- libmpcodecs/vf_pullup: update to latest version from mplayer · 81e357db
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  81e357db
- libmpcodecs/vf_uspp: update to latest version from mplayer · 13afcdd0
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  13afcdd0
- libmpcodecs/vf_unsharp: update to latest version from mplayer · 3ce3d4cc
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3ce3d4cc
- libmpcodecs/vf_spp: update to latest version from mplayer · 7a488560
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  7a488560
- libmpcodecs/vf_sab: update to latest version from mplayer · 14132599
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  14132599
- libmpcodecs/pullup: update to latest version from mplayer · fe8bc6dd
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  fe8bc6dd
- libmpcodecs/vf_noise: update to latest version from mplayer · 8f7e3e67
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8f7e3e67
- libmpcodecs/vf_pp7:update to latest version from mplayer · 3ca46d0c
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3ca46d0c
- libmpcodecs/vf_qp: update to latest version from mplayer · fdd574ed
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  fdd574ed
- libmpcodecs/vf_mcdeint: update to latest version from mplayer · b7e66229
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b7e66229
- libmpcodecs/vf_ilpack: update to latest version from mplayer · 25ed6e99
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  25ed6e99
- libmpcodecs/vf_ivtc: update to latest version from mplayer · 011702f5
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  011702f5
- libmpcodecs/vf_fspp: update to latest version from mplayer · 0b36a05c
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0b36a05c
- libmpcodecs/av_helpers: update to latest version from mplayer · 2b9eb616
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2b9eb616
- libmpcodecs/vf_filmdint: update to latest version from mplayer · e02c713f
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e02c713f
- libmpcodecs/vf_divtc: update to latest version in mplayer · 5d011511
  multiple authors authored Feb 05, 2013
```
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5d011511