Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 02:11:21 +0000 (04:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 02:11:21 +0000 (04:11 +0200)
* commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845':
  h263: Convert function to macro

Conflicts:
libavcodec/h263.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h263.c
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/mpegvideo_enc.c
libavcodec/vaapi_mpeg4.c

Simple merge
@@@ -121,7 -123,7 +123,6 @@@ int av_const h263_get_picture_format(in
  
  void ff_clean_h263_qscales(MpegEncContext *s);
  int ff_h263_resync(MpegEncContext *s);
- int ff_h263_get_gob_height(MpegEncContext *s);
 -const uint8_t *ff_h263_find_resync_marker(const uint8_t *p, const uint8_t *end);
  void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code);
  
  
Simple merge
Simple merge
Simple merge