Commits · b1eb92a6bcdaa57a150a7493bc29f82cbc36ef99 · Linshizhi / ffmpeg.wasm-core

17 Mar, 2014 33 commits

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

Michael Niedermayer authored Mar 17, 2014

* qatar/master:
  libx264: check color_range

Conflicts:
	libavcodec/libx264.c

See: 48d39c87Merged-by: Michael Niedermayer <michaelni@gmx.at>

b1eb92a6

Merge commit '' · 34e325ef

Michael Niedermayer authored Mar 17, 2014

* commit 'bf0d7da7':
  ljpeg: check color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>

34e325ef

Merge commit '' · 987b8730

Michael Niedermayer authored Mar 17, 2014

* commit '2183432e':
  mdec: set color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>

987b8730

Merge commit '' · 020baa0b

Michael Niedermayer authored Mar 17, 2014

* commit '1c1fbc70':
  mjpeg: set color_range

Conflicts:
	libavcodec/mjpegdec.c

See: 2f870e26Merged-by: Michael Niedermayer <michaelni@gmx.at>

020baa0b

Merge commit '' · ca0e6fa7

Michael Niedermayer authored Mar 17, 2014

* commit '6612a03d':
  fraps: set color_range

Conflicts:
	libavcodec/fraps.c

See: 79f452f4Merged-by: Michael Niedermayer <michaelni@gmx.at>

ca0e6fa7

Merge commit '' · 1c79ca27

Michael Niedermayer authored Mar 17, 2014

* commit '5b1b91cf':
  tiff: Support rgba encoding

Conflicts:
	libavcodec/tiffenc.c

See: d7fc1006Merged-by: Michael Niedermayer <michaelni@gmx.at>

1c79ca27

Merge commit '' · ba7cdb97

Michael Niedermayer authored Mar 17, 2014

* commit '6d78e852':
  img2: add j2c file extension

Conflicts:
	libavformat/img2enc.c

See: e8df1827Merged-by: Michael Niedermayer <michaelni@gmx.at>

ba7cdb97

Merge commit '' · c738ffcf

Michael Niedermayer authored Mar 17, 2014

* commit '58c21596':
  raw, nut: Support rgba64 encoding

Conflicts:
	libavcodec/raw.c
	libavformat/nut.c

See: edf34c34Merged-by: Michael Niedermayer <michaelni@gmx.at>

c738ffcf

Merge commit '' · 3731c409

Michael Niedermayer authored Mar 17, 2014

* commit 'cccac765':
  png: Support rgb48 and rgba64 encoding

Conflicts:
	libavcodec/pngenc.c

See: f94ce3bcMerged-by: Michael Niedermayer <michaelni@gmx.at>

3731c409

Merge commit '' · a00d4c59

Michael Niedermayer authored Mar 17, 2014

* commit 'c598b569':
  png: K&R formatting cosmetics

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

a00d4c59

Merge commit '' · b361a0bf

Michael Niedermayer authored Mar 17, 2014

* commit 'f7518f1a':
  codec_desc: update dvaudio tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b361a0bf

Merge commit '' · 85d28a86

Michael Niedermayer authored Mar 17, 2014

* commit '6d7b22fb':
  isom: fix C99-style declaration

See: cd0982e1Merged-by: Michael Niedermayer <michaelni@gmx.at>

85d28a86

Merge commit '' · 6b1ca170

Michael Niedermayer authored Mar 17, 2014

* commit '1481d24c':
  RGBA64 pixel formats

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/utils.c

See: 9569a3c9
See: 92afb431, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>

6b1ca170

Merge commit '' · ad9a6e19

Michael Niedermayer authored Mar 17, 2014

* commit 'd24e9a99':
  h264 does not depend on mpegvideo any more
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ad9a6e19

avcodec/vdpau: update ff_vdpau_h264_set_reference_frames() to H264Picture · 3e3b0b3a
Michael Niedermayer authored Mar 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3e3b0b3a

Merge commit '' · dc226c02

Michael Niedermayer authored Mar 17, 2014

* commit '7245a0ae':
  mpegvideo: remove h264-only fields

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

dc226c02

Merge commit '' · 329a3286

Michael Niedermayer authored Mar 17, 2014

* commit 'be039278':
  mpegvideo: move ff_draw_horiz_band() to mpegutils.c

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

329a3286

avcodec/dxva2: fix pointers after H264Picture · 29be9b53
Michael Niedermayer authored Mar 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
29be9b53
avcodec/vdpau: fix ff_vdpau_get_surface_id() argument after H264Picture · 2a37e560
Michael Niedermayer authored Mar 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2a37e560
avcodec/vaapi: fix pointer types after H264Picture changes · 377cfc28
Michael Niedermayer authored Mar 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
377cfc28

Merge commit '' · 9517900b

Michael Niedermayer authored Mar 17, 2014

* commit 'e0c16e4e':
  mpegvideo: move mpegvideo formats-related defines to mpegutils.h

Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_mvpred.h
	libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9517900b

Merge commit '' · 3e583380

Michael Niedermayer authored Mar 17, 2014

* commit '136034d8':
  h264: Remove MotionEstContext and move the relevant fields to H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3e583380

Merge commit '' · bb3c0571

Michael Niedermayer authored Mar 17, 2014

* commit 'e3c2d0f3':
  h264: Replace mpegvideo-specific MAX_THREADS by private define

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

bb3c0571

Merge commit '' · a81a2b51

Michael Niedermayer authored Mar 17, 2014

* commit '5d1c2e53':
  h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

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

a81a2b51

avcodec/h264: h264_set_erpic() clear destination · 6102dda1
Michael Niedermayer authored Mar 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6102dda1

Merge commit '' · c237e88d

Michael Niedermayer authored Mar 17, 2014

* commit '9b749c82':
  h264: move relevant fields from Picture to H264Picture

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

c237e88d

avcodec/error_resilience: fix the case when MVs are not available · 4f22e39e
Michael Niedermayer authored Mar 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4f22e39e
avcodec/mpegvideo: ff_mpeg_set_erpic() clear destination · 8ef9dcf1
Michael Niedermayer authored Mar 17, 2014
```
Fixes crash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8ef9dcf1

Merge commit '' · 533bc4c0

Michael Niedermayer authored Mar 17, 2014

* commit 'd66e305b':
  er: move relevant fields from Picture to ERPicture

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

533bc4c0

Merge commit '' · 3dab9e80

Michael Niedermayer authored Mar 17, 2014

* commit '1c79b162':
  h264: directly use frames in ff_h264_draw_horiz_band()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3dab9e80

Merge commit '' · 3ddf9b5b

Michael Niedermayer authored Mar 17, 2014

* commit '75af13a0':
  mpegvideo: directly use frames in ff_draw_horiz_band()

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

3ddf9b5b

avcodec/x86/idct_sse2_xvid: move offsets out of MANGLE() · b73aae6f
Matt Oliver authored Mar 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b73aae6f
avcodec/h264: be more tolerant on what pixel format changes trigger reinits · 8e92ff25
Michael Niedermayer authored Mar 17, 2014
```
Fixes Ticket3260
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8e92ff25

16 Mar, 2014 7 commits
- Add missing external declarations. · 9eb3f11c
  Matt Oliver authored Mar 16, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9eb3f11c
- Fixed 64bit conformance with mvzbl. · 590805b7
  Matt Oliver authored Feb 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  590805b7
- swscale/x86/swscale: remove unused constants · 2f955d57
  Michael Niedermayer authored Mar 16, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2f955d57
- libx264: check color_range · 75177b2f
  Vittorio Giovara authored Mar 12, 2014
  
  75177b2f
- ljpeg: check color_range · bf0d7da7
  Vittorio Giovara authored Mar 12, 2014
  
  bf0d7da7
- mdec: set color_range · 2183432e
  Vittorio Giovara authored Mar 12, 2014
  
  2183432e
- mjpeg: set color_range · 1c1fbc70
  Vittorio Giovara authored Mar 12, 2014
  
  1c1fbc70