diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-10 14:05:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-10 14:06:20 +0200 |
| commit | bff2afb3e978c9cdffdd03a2571e4f6ddab74731 (patch) | |
| tree | 7a92225c964848221a8be28232d1f6137475eb66 /libavformat/rtpdec_formats.h | |
| parent | e4fe4d01fc31bfdabf6f9b106c633139287a400d (diff) | |
| parent | a84edbacaf5adbe6e3672851aa8b3034b95787e2 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Only compile motion_est code when encoders are enabled
mem: fix typo in check for __ICC
fate: mp3: drop redundant CMP setting
rtp: Depacketization of JPEG (RFC 2435)
Rename ff_put_string to avpriv_put_string
mjpeg: Rename some symbols to avpriv_* instead of ff_*
yadif: cosmetics
Conflicts:
Changelog
libavcodec/mjpegenc.c
libavcodec/x86/Makefile
libavfilter/vf_yadif.c
libavformat/version.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_formats.h')
| -rw-r--r-- | libavformat/rtpdec_formats.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h index a0c61a84b9..471888b703 100644 --- a/libavformat/rtpdec_formats.h +++ b/libavformat/rtpdec_formats.h @@ -46,6 +46,7 @@ extern RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler; extern RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler; extern RTPDynamicProtocolHandler ff_h264_dynamic_handler; extern RTPDynamicProtocolHandler ff_ilbc_dynamic_handler; +extern RTPDynamicProtocolHandler ff_jpeg_dynamic_handler; extern RTPDynamicProtocolHandler ff_mp4a_latm_dynamic_handler; extern RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler; extern RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler; |