diff options
| author | James Almer <jamrial@gmail.com> | 2016-08-01 18:15:07 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-08-01 18:15:07 -0300 |
| commit | 517dd04f6df3103a6f2bc20b43b956d055ad983f (patch) | |
| tree | 68ec6cc818b6075ee1c88b100e502148ac51741f /libavformat/tcp.c | |
| parent | fd4eb56528e1bf6529397051838a28d2a39d8e01 (diff) | |
| parent | bc7f4268514624e1286ea76d27a89a56b4ee18e1 (diff) | |
| download | ffmpeg-517dd04f6df3103a6f2bc20b43b956d055ad983f.tar.gz | |
Merge commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1'
* commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1':
h264: drop tests whether the codec id is AV_CODEC_ID_H264
Conflicts:
libavcodec/h264dec.c
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/tcp.c')
0 files changed, 0 insertions, 0 deletions