aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libfdk-aacenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-19 20:37:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-19 20:39:15 +0200
commite6f17337cf2081ccbf4635095ec3871805185867 (patch)
tree3628b3d5ffd3323ccc974f16c478f39d4c7b910d /libavcodec/libfdk-aacenc.c
parentd7888ff644f5965b7a54ecefea9af1469fd1d510 (diff)
parent9f6c36d961d27283808310e3ca1d8390b55fce9b (diff)
downloadffmpeg-e6f17337cf2081ccbf4635095ec3871805185867.tar.gz
Merge commit '9f6c36d961d27283808310e3ca1d8390b55fce9b' into release/2.4
* commit '9f6c36d961d27283808310e3ca1d8390b55fce9b': roqvideoenc: set enc->avctx in roq_encode_init See: cf82c426fadf90105e1fb9d5ecd267cc3aa2b288 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacenc.c')
0 files changed, 0 insertions, 0 deletions