diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:26:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:26:42 +0100 |
| commit | 2bedcbf82274c08ad137257ed6d81962cf3a9ffd (patch) | |
| tree | 412d41d8672b0459afdde5b6128ac083f8b066df | |
| parent | a51b192f3b8f89a1bafba629655df55348b14195 (diff) | |
| parent | b651c9139e1ab222d5aab9151dcd7d6e40e49885 (diff) | |
| download | ffmpeg-2bedcbf82274c08ad137257ed6d81962cf3a9ffd.tar.gz | |
Merge commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885'
* commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885':
rtpdec_mpa_robust: Move .enc_name to the start of the struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpdec_mpa_robust.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec_mpa_robust.c b/libavformat/rtpdec_mpa_robust.c index 50c58e1082..3a707d2289 100644 --- a/libavformat/rtpdec_mpa_robust.c +++ b/libavformat/rtpdec_mpa_robust.c @@ -214,11 +214,11 @@ static int mpa_robust_parse_packet(AVFormatContext *ctx, PayloadContext *data, } RTPDynamicProtocolHandler ff_mpeg_audio_robust_dynamic_handler = { + .enc_name = "mpa-robust", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_MP3ADU, .init = mpa_robust_init, .alloc = mpa_robust_new_context, .free = mpa_robust_free_context, .parse_packet = mpa_robust_parse_packet, - .enc_name = "mpa-robust", }; |