diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 20:45:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 20:45:41 +0200 |
| commit | 9db747b2a300380dd65032818155067054332dae (patch) | |
| tree | 72d665b0be4eb133524bb21fb4a66a4b30dfb0cb /libavformat/rtmpproto.c | |
| parent | 5dba4cbc2f3f64b188289804216a737528ced290 (diff) | |
| parent | 08e087ccf7f7ef9b4e8c55b571bc779c0bc815b0 (diff) | |
| download | ffmpeg-9db747b2a300380dd65032818155067054332dae.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: rtmp_parse_result() add case for video and audio packets to avoid undesired debug output.
configure: Move the getaddrinfo function check into the network block
configure: Remove an unused 'have' item
mpeg: remove disabled code
libfdk-aac: Check if cutoff value is valid
network: Always use our version of gai_strerror on windows
network: Undefine existing gai_strerror definitions
network: Extend the fallback gai_strerror implementation to handle more error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 4bdda4d097..1290b7e5cf 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -959,6 +959,10 @@ static int rtmp_parse_result(URLContext *s, RTMPContext *rt, RTMPPacket *pkt) return ret; } break; + case RTMP_PT_VIDEO: + case RTMP_PT_AUDIO: + /* Audio and Video packets are parsed in get_packet() */ + break; default: av_log(s, AV_LOG_VERBOSE, "Unknown packet type received 0x%02X\n", pkt->type); break; |